From patchwork Tue May 4 10:01:54 2021 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: 430831 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3642430jao; Tue, 4 May 2021 03:04:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweWAQxpaohqywsnD4qWKwalXZw9KqXmnyCkAVTz0wwsbVw1TYn3uX0BrG3qHAh6I5GlT25 X-Received: by 2002:a2e:9e16:: with SMTP id e22mr2123950ljk.305.1620122674302; Tue, 04 May 2021 03:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122674; cv=none; d=google.com; s=arc-20160816; b=e3s9EYyFxfB/K9O4lUc6bzBcnk7gKXHD4uVukB3xxUvFw8PzF/vD9c2rjfv4cocV1V rT00eA4Ob4uZKPWt+NuT1m59nuZUrzBSIrhP6YmkFzvtqZ+iHu/elQrC5vDdFF1K4xVw tE3JIhm4stTIiFp+lZp/L/sd5DzB7IJEFUusVQ3P8pGhG8S1o4G2TErSg21nJOyxIqCU CjbpOy81TK5+W8lvfmSJmXpW2EduMiuHJ+QkYW3/siAi8UPO0WUI/Wbfv/kaw6znMq2+ WAyZh4S1IJX2/aYKI0QYeNz1uBb8Lm6v3zO17fd/AyaKRu/xCwvbB1BJUVDwFkUJjR1X oRBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=tLKjqMKIjh3YXoNizCAFrfsiNgZ3bBB8hCFaWw47VeQ=; b=WwfdeqKVaNlOTX1i0P8RH+kkMIDw44X0DBiYkbbpSDP3NEYd3UrFScjNUg7ahHz8rc 5x5nFkuHtgIjZFs68zLJNvvcgmZLZCvbVc3vSM9xWo6A5OdVAJ1p3uUcYXagYt7OM/Iu OvhR2fyBCDs1E6Kf/Hg7T9SmiUHudDc3WT1joeknf/JKIKweLC7kOLsJPvkncoUmyKEo yJlIhk1EC22Bq4dmuiCP85u50iVhkix71Q+p1FZRDYqm/HHUOa6SqKn+XVZ7PK1dDAI3 qWS0Z6x3a6bX55EBl+nXrqZSBu7L6DVK+pdQHYFhzwB4RIe6YcwqC0r75FxrAVCT0Me6 JgeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S2L6lmg7; 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=fail (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 z4si3123077lfr.557.2021.05.04.03.04.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:04:34 -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=fail header.i=@linaro.org header.s=google header.b=S2L6lmg7; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldruq-0003eW-H3 for patch@linaro.org; Tue, 04 May 2021 06:04:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrsq-0002KF-Tv for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:28 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:38437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrsp-00032A-3o for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:28 -0400 Received: by mail-wm1-x331.google.com with SMTP id p6-20020a05600c3586b029014131bbe5c7so887374wmq.3 for ; Tue, 04 May 2021 03:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tLKjqMKIjh3YXoNizCAFrfsiNgZ3bBB8hCFaWw47VeQ=; b=S2L6lmg7CpkdVe79ff74KQGmnejFXTFQtzLhw3gcCV3xmONWFEL9MIyKoTQIL4X/ni skzESoBgRRiqzghGjEXEzK44/Nt3J013HmRM7RDtnPhrwkebyRI45uBe9EYD1QEZ3nbt o2SEWG1kVqktCNlrZIqh1T55V3q6xzZpxh3TcIXgJC7t1vY6pvy8J+sClbACFJ9lO+j/ QXalM3HczOOzXH6Bi416oVd1zDMG90HZZBOdQqNtClop5syAXfGKGbXlSEy4ogunuo2T oX4CDKUGQLWk1wryigBTX8P+vOH8CSWwwidD06l9L7qdhYJlwG2VuoyJ3KB3OSIsXlGU jmRw== 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:mime-version:content-transfer-encoding; bh=tLKjqMKIjh3YXoNizCAFrfsiNgZ3bBB8hCFaWw47VeQ=; b=Ner2NkZIZ7VcGesGKDTSF/dfOjbVSxkolG5cDJ03hcrjFruLy2Gu+lLgMw5eiGIX79 s2Gsukq3tNv03dCewL5Dxt9NfpEjSPMTPqGY6+xOI2vLzGwEYhKn5E1YoQX89f/OZw3I svRyajW5baos8UxquoTCVNqFdx/qWYI2RP5ld90JytnzEVtA2iYPjhjoYNM/L74PWb3X 17XVIByK6YfoUp3CUHZ3uPSL8ecglkYTgt6sEcWKEU2VUyetTAFFbTcuWuHNr5XgMFvu ABxh14v2gGk3lXqE25qv0jsvi2roVL97st9OC4X6HM4/trEikxO6qs3iI95dIQvgdEOP lytg== X-Gm-Message-State: AOAM533+IrWhdSaElQC3rLJgkhUdWMlsks3RF43PdFqBcgEyxVU3c9v1 andKyraKUbucwaoCQD+soCqFCg== X-Received: by 2002:a05:600c:4fd4:: with SMTP id o20mr3160245wmq.166.1620122545627; Tue, 04 May 2021 03:02:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 61sm16437959wrm.52.2021.05.04.03.02.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 957941FF87; Tue, 4 May 2021 11:02:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/30] checkpatch: Fix use of uninitialized value Date: Tue, 4 May 2021 11:01:54 +0100 Message-Id: <20210504100223.25427-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Isaku Yamahata , berrange@redhat.com, f4bug@amsat.org, Greg Kurz , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz checkfilename() doesn't always set $acpi_testexpected. Fix the following warning: Use of uninitialized value $acpi_testexpected in string eq at ./scripts/checkpatch.pl line 1529. Fixes: d2f1af0e4120 ("checkpatch: don't emit warning on newly created acpi data files") Signed-off-by: Greg Kurz Reviewed-by: Isaku Yamahata Reviewed-by: Alex Bennée Cc: isaku.yamahata@intel.com Message-Id: <20210408164610.14229-1-alex.bennee@linaro.org> Message-Id: <161786467973.295167.5612704777283969903.stgit@bahia.lan> Signed-off-by: Alex Bennée --- scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 8f7053ec9b..3d185cceac 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1532,6 +1532,7 @@ sub process { ($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ && (defined($1) || defined($2)))) && !(($realfile ne '') && + defined($acpi_testexpected) && ($realfile eq $acpi_testexpected))) { $reported_maintainer_file = 1; WARN("added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr); From patchwork Tue May 4 10:01:55 2021 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: 430828 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3641527jao; Tue, 4 May 2021 03:03:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoyJXDVSkBRBke+T5CfPpNzhwNQwPpnaTziWXoY2zqFHZE7rI/BVo1cPtNlOFBefuoMSW5 X-Received: by 2002:aa7:cd8b:: with SMTP id x11mr25342120edv.87.1620122602700; Tue, 04 May 2021 03:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122602; cv=none; d=google.com; s=arc-20160816; b=EFLZqFhYiiRIfPLQhct0iCwNWxca5y3CZPLPZ17P6U8sO4Bzfw4x6YX5wlMI+k36GN 7OKNVvnyXWySA1ipt6KC/45PxFOuyciQVvRR80+UypYdmwH9NN3b2/0yGp6W1f7lPS3A qs56da9LG7AvlgH1gSywPu3vEgcv0bQzSam8iEm8BxrUpDt6lt4PGcC4fWJPUR4NYUb/ nnxuhF85DU04z9AFi0FZ5UtiNVJUNtYB9OOJ7QIaNc/ERFZCQQn7nU7iAwE4BRc/zmWj 26GUOGy0hLMovggRMAzCFd1B2rpERTEOvN1ScSVt9ib2Ff+EQQPNlM4z/qwV65oka6nI jQzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=TuKozATKQ3Td5Fp2Tf/kZG/QQ+gsJcItcXeBYs6um/I=; b=L6z8+7fHpWHdGbYmgMk4UqGCtjzti1nGe84Lr1Mm86KhX3Hdf8f2TPqpxRjpW22FMQ a74MCQJgAS0cMYvoG9RKY/eqkXvDzBpPxG2MaDWKvrgPkaqBKRw3erRlBdQz72zqT0Fo LKAbeDltMUMyu4UJXdyzQxjWufHezv9MIzeRQ06ES5XRhMZ3vRjvmp9Fr87NlKeqNP9k KGxWPmP3VSuQ/G0SLQZ8K8KrPZIbPTQaBu3Xve1Rh1seYDxPfIIXwIeROlVicYX0kmc9 K9UP6BBg1SJGd+WZ05bVvskS+/JczWri97tiRfr3t+O2bzn/jfUX0/EFk18oK9lA98t7 Su+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zT2tMGNo; 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=fail (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 g12si4153464edw.596.2021.05.04.03.03.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:03:22 -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=fail header.i=@linaro.org header.s=google header.b=zT2tMGNo; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldrth-0002RC-NS for patch@linaro.org; Tue, 04 May 2021 06:03:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrsw-0002Pl-5B for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:34 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:55031) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrst-00034c-K0 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:33 -0400 Received: by mail-wm1-x32c.google.com with SMTP id o127so880904wmo.4 for ; Tue, 04 May 2021 03:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TuKozATKQ3Td5Fp2Tf/kZG/QQ+gsJcItcXeBYs6um/I=; b=zT2tMGNoVR0OUhvLLWkQe4JvtgcVPBP4Aspd3sBsRqReY/olChOA4aL7fB+rlYm7gk D1a2nm4miKfB7+7VcorGbe7JhaebukSozKB4IooX36xl/mRS1AJfk+omU4DYx4S5IgM4 nOpeuq3E7+s3lNYTThInz71z8WL1O2pkK9TwNtrKl0jLn5dsq7maH0eiYAVRItptdfq1 uP9rLZDOHl8NZqpNDxtu+ePmBuDgd6Jj7r66xoeKbVFG7k7OVFroWVEyn8x0vQ7rxToC lqbsczI5QA3NeVtpVgJNCZwZChQWFHvi+arNJpKPQSJpjum89IleapmsFjzoQ/rx2PWB Sq6g== 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:mime-version:content-transfer-encoding; bh=TuKozATKQ3Td5Fp2Tf/kZG/QQ+gsJcItcXeBYs6um/I=; b=RCJe7i3/UN1OrinhihWCs+r3F8CNhtYNRMUgzFJvzN4OBfrNbMwxSBKN6vylP/Xdh9 MBOKWKOvvViTK1wElwJT8Ov/4dEXxzuVT1Nl6hcHVdmDaznAweSkeZMxIy/u/iSzcEW/ a4teoX7HZou5tCIyoB8Wof4qdxH3WM5f5imkMiZoSwtLKbsQNcjF2XZjbWeQ7a0G8z/Z klGgDALIwt0bpnEgpBV6LUAPfyjRiufviBtf9dSVWhQmdWMiRVYyxEwV3HSzFTmzADA1 +N2pous11fEiXLet9UTlq1wII3eZbsWYgKN2B7LsnRCs1mVgCsCX4uOhv90RmweQ3bFH LHTQ== X-Gm-Message-State: AOAM530oUHLBxCdXc4nAwgtsIXZVqbI8Sjd9qxQT2MUsg18ArzApe6SJ t4jaNn+NO1XLXidOU9luku7oPA== X-Received: by 2002:a7b:c8ca:: with SMTP id f10mr26462250wml.118.1620122549654; Tue, 04 May 2021 03:02:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j13sm20955286wrd.81.2021.05.04.03.02.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AB3211FF8C; Tue, 4 May 2021 11:02:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/30] tests/docker: fix copying of executable in "update" Date: Tue, 4 May 2021 11:01:55 +0100 Message-Id: <20210504100223.25427-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have the same symlink chasing problem when doing an "update" operation. Fix that. Based-on: 5e33f7fead ("tests/docker: better handle symlinked libs") Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo --- tests/docker/docker.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index d28df4c140..0435a55d10 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -548,7 +548,14 @@ def run(self, args, argv): libs = _get_so_libs(args.executable) if libs: for l in libs: - tmp_tar.add(os.path.realpath(l), arcname=l) + so_path = os.path.dirname(l) + name = os.path.basename(l) + real_l = os.path.realpath(l) + try: + tmp_tar.add(real_l, arcname="%s/%s" % (so_path, name)) + except FileNotFoundError: + print("Couldn't add %s/%s to archive" % (so_path, name)) + pass # Create a Docker buildfile df = StringIO() From patchwork Tue May 4 10:01:56 2021 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: 430833 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3643762jao; Tue, 4 May 2021 03:06:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkrIjl7a83m2nyYMFJJHDUY0IavkgUAEoo0jGm4qjZ7Pr9fB4KM+kBr3pKVODjyqjCrjwX X-Received: by 2002:a17:906:364d:: with SMTP id r13mr21916646ejb.250.1620122788628; Tue, 04 May 2021 03:06:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122788; cv=none; d=google.com; s=arc-20160816; b=nP3CzMBkiTFEPWKxIgGhKq/zF0+vVhkB2zaRbW7X6ZC/XRcGSX0QkawWZQPfrFzpGp 0B8Fid8gKx8nKREbFpEvwzFYP95PrGOm+iQEmK6Me7CazlGGWbnQ+pvGaTxcdBN9lBQH qRfUDvemlfSjfj1c/fSICrm3BLL38RznrFT9cZx810T0jo5ee3JJ4Un93WNgzDKyLQld fWJ4FT7QpQ6MLzioVh8cKoa+xhw4xbF+mcvi3QIsQLuDV/UH+45R2RgJm82rl4aPLiNq uaD/rs76nBkWcyDJsj/OspRGfD1J11y6iC9kjFSNpceDJMJ9ksIjq0/4VYlA05cIn9zF ZI0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=+W6vzYOHSyrjetzgB57V0E/SW7N0nADhYjK0hwWdl18=; b=DwT7B16woza812MSb2dg0wBXaxSe9zJ4aHkgZ9GsuspPKPOUpwl6/Rsg5l4sGPHm4o 9d/cZF8QboAiXzAGFMjb61urMh9G5a6DjGSTC7ZX25888wmlQKfnNTYsCpDv6Jb6mt5L fiFdIfajwzHBUN7762CdY8WAHWeogoV3HQop0+QeSVdO0/j6kG0SRLLgmnH+iqmUWPX3 C/OGI+UHraV+x2s3gipZC4ILlGNTdINbqifsljEXNn+E2Ln9s4oa/oqUpS1bUrC4huF4 3gCPKx1Pm0PjICYgBRaWdC1gyLoahco6S/omyaU/wq1dYRCWAdIVfHpVYldBUh1Yo/lU r9Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="rupX56Q/"; 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=fail (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 op18si2283294ejb.39.2021.05.04.03.06.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:06:28 -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=fail header.i=@linaro.org header.s=google header.b="rupX56Q/"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldrwh-0005fs-I2 for patch@linaro.org; Tue, 04 May 2021 06:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrsw-0002QO-TK for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:34 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:56062) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrsv-00036K-2L for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:34 -0400 Received: by mail-wm1-x32d.google.com with SMTP id i128so3014490wma.5 for ; Tue, 04 May 2021 03:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+W6vzYOHSyrjetzgB57V0E/SW7N0nADhYjK0hwWdl18=; b=rupX56Q/KY3gf4lVD3LsZ/aWo6mKUWKKoHDy/fGVL1XdYtqU5Pcw69pPuSI3lXY8Et 6kwJgIPYLiYO40KU/w0BZWONYClixQBqmIu+81hQN0eNz8PQOLU5ia8fX5gEb7XjoxVu o52LaJUBj0+Xg58BaGy4Gv1pu9HioY33/bPXs/vB9Bs1iK/WkOudktlft4ymNrizCdQR d5WVL0IFkUngyQ30KohDOoi4WtTd39de8PvqZYgRJlCU06B9ifYsf4YsGuPIyKAb7IZM vE/buOoxEdsCOkJvNZL86TesTu7ON0sM2WHWqIengmI+LpMAGA3lIpIR+UWAlmcqsU+u hkyw== 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:mime-version:content-transfer-encoding; bh=+W6vzYOHSyrjetzgB57V0E/SW7N0nADhYjK0hwWdl18=; b=r/6IvhxQZYa0cXlNzLYdWptf9ymWPxfgUZ1HcG2yPXI+4eVMWkijgD+D851HIJfebU GvRMKn7KU23t71E3UoH3xU0fyoF0tYo9rfvik8nQxwa7yvm//1Df1fLulRryfO6j+Ite BGo3ODqsZTyRIcAzUUvcRC8TOMKziJLF74+pD7zYS/oBMnTwXWezKvjFDUd4okLRfAAi wJYvLTQsMd3SwwSPJ+SMe2XU+X5HjmWk7KlrAl/6ioGE90DiV9uNdel+UlBOYDPbnVp8 xLNxWRREolqgJU+hw5eAyjnfQWLTDnHVRRyz2H8MfpG+IrFXJ9kDsLknT1TtmkPof1MR W+hw== X-Gm-Message-State: AOAM5333yFW2e+EHYtmvwUISKojshKaPU3QSjPcFq2toJYNtrVD5F50T /9i4f3vgNEVMzgnINadNJEVSyA== X-Received: by 2002:a1c:6754:: with SMTP id b81mr25813804wmc.16.1620122551716; Tue, 04 May 2021 03:02:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b10sm2011739wrr.27.2021.05.04.03.02.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C6E291FF8F; Tue, 4 May 2021 11:02:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/30] tests/docker: make executable an optional argument to "update" Date: Tue, 4 May 2021 11:01:56 +0100 Message-Id: <20210504100223.25427-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We're going to extend the abilities of the command shortly. Reviewed-by: Willian Rampazzo Signed-off-by: Alex Bennée --- v2 - fix indention issue --- tests/docker/Makefile.include | 2 +- tests/docker/docker.py | 56 ++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 28 deletions(-) -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9f464cb92c..820423d718 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -248,7 +248,7 @@ docker-run: docker-qemu-src $(if $(EXECUTABLE), \ $(call quiet-command, \ $(DOCKER_SCRIPT) update \ - $(IMAGE) $(EXECUTABLE), \ + $(IMAGE) --executable $(EXECUTABLE), \ " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ $(DOCKER_SCRIPT) run \ diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 0435a55d10..9b3425fec2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -523,7 +523,7 @@ class UpdateCommand(SubCommand): def args(self, parser): parser.add_argument("tag", help="Image Tag") - parser.add_argument("executable", + parser.add_argument("--executable", help="Executable to copy") def run(self, args, argv): @@ -532,35 +532,37 @@ def run(self, args, argv): tmp = tempfile.NamedTemporaryFile(suffix="dckr.tar.gz") tmp_tar = TarFile(fileobj=tmp, mode='w') - # Add the executable to the tarball, using the current - # configured binfmt_misc path. If we don't get a path then we - # only need the support libraries copied - ff, enabled = _check_binfmt_misc(args.executable) - - if not enabled: - print("binfmt_misc not enabled, update disabled") - return 1 - - if ff: - tmp_tar.add(args.executable, arcname=ff) - - # Add any associated libraries - libs = _get_so_libs(args.executable) - if libs: - for l in libs: - so_path = os.path.dirname(l) - name = os.path.basename(l) - real_l = os.path.realpath(l) - try: - tmp_tar.add(real_l, arcname="%s/%s" % (so_path, name)) - except FileNotFoundError: - print("Couldn't add %s/%s to archive" % (so_path, name)) - pass - # Create a Docker buildfile df = StringIO() df.write(u"FROM %s\n" % args.tag) - df.write(u"ADD . /\n") + + if args.executable: + # Add the executable to the tarball, using the current + # configured binfmt_misc path. If we don't get a path then we + # only need the support libraries copied + ff, enabled = _check_binfmt_misc(args.executable) + + if not enabled: + print("binfmt_misc not enabled, update disabled") + return 1 + + if ff: + tmp_tar.add(args.executable, arcname=ff) + + # Add any associated libraries + libs = _get_so_libs(args.executable) + if libs: + for l in libs: + so_path = os.path.dirname(l) + name = os.path.basename(l) + real_l = os.path.realpath(l) + try: + tmp_tar.add(real_l, arcname="%s/%s" % (so_path, name)) + except FileNotFoundError: + print("Couldn't add %s/%s to archive" % (so_path, name)) + pass + + df.write(u"ADD . /\n") df_bytes = BytesIO(bytes(df.getvalue(), "UTF-8")) From patchwork Tue May 4 10:01:57 2021 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: 430836 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3646252jao; Tue, 4 May 2021 03:09:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbC+wrbwAKat9pQ13ph4Zd0d5LtoCwlbyu960CDoGduvs6GWTsTVfLk2TVKrQZlBPu72/n X-Received: by 2002:a67:d909:: with SMTP id t9mr7298076vsj.18.1620122975453; Tue, 04 May 2021 03:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122975; cv=none; d=google.com; s=arc-20160816; b=TWstBH9lUUys5eYs0alLWRkD96hFoVtmfxmwHp+W+KnqcDpQ0YCFF5ZOkAKfnABZcY 0yecP++6AP0WzwPfghuOpRuzXc2fV5spzs7nGAzBXmKTqz8lQo0eq5+PaCOVTq6nKxCZ z1r/YGr41WsF6gC3w/5i644XmxE8wEv15Wb9peyBVLs+SV4kvpHRmf+M5EvWfwbY4nmp SSLatgsxJ1Wwg6NUopUZtlmsDkqlJBn9vaxCsN6ikX2GTz2lgWNABbzE3MfrCxwVsioU g4V6gKFrwILN+aPtdEy8hLoeVw7pal50Zsa1EAlGZNwT9upbM1ba9TyTqQLqFAeOOkE3 r4KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=itDJZjFFgEhRSTkYYv8ljT67JkqTdrMRXTGjjJSCeDY=; b=vPiSU3hmQHouXZVEXJaoCYs6YBge2ICWzyU+k5lbdw+tT9wNVi1NrccNFVeVIj6G3S z6O0AfrMDuhAzNaM7jOSzxAAA1BrtB49SNYammMBCq/tZDJwvTkJXTKtblLC+ZuHoSMw zF5hnR5izw1VwjC/s9ggWyBY3xb46cyK9ywbx2s5V/G5VdBxa+7lcC2oyvJ4lK8pQUIg LZBIhIZ+wgJxBLJSqAb1xenC+gLwjNfTCZZgrRnwaoz9WKxl2lx0SNVlh+yMfekUjzW2 qJqW4vcvt5RtpUnurU7Xdlryov6UrdvYKPTQWuPo0dUkMJGLhISWHDWpwOh4XDQduaGj C+Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fuol/klH"; 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=fail (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 l18si7344591vsi.368.2021.05.04.03.09.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:09:35 -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=fail header.i=@linaro.org header.s=google header.b="fuol/klH"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldrzh-0000vz-2E for patch@linaro.org; Tue, 04 May 2021 06:09:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrsx-0002RV-RG for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:35 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrsv-00036w-Uf for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:35 -0400 Received: by mail-wr1-x431.google.com with SMTP id t18so8721833wry.1 for ; Tue, 04 May 2021 03:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=itDJZjFFgEhRSTkYYv8ljT67JkqTdrMRXTGjjJSCeDY=; b=fuol/klHlzEuMSO1cf/52mqJCEFgJ7RwJXfDanShmWtj5GNpnS0unFZxsO0ehtNzLZ qkTHfD0+DD7a9d42StBBIVoC6pHZ6OEliRG3jqVN2JPM2oarmLOavwg5KIwzuWTqtnwn zjf4zZt5tfnZNbs8GS5wlBSMVDWVvU6WTDvwnwQtwQGwTHn5wTMXF9V6pztrBJd3hgUU H+j39pI7rSOjN9iV4uwxbsHyt5fq/RPVwReOAwyEgGsVTG0oUF4u+z6jdwoOEtu28iD0 tEZR60KbttsFvJ6LBDNZ8kGnJ1foRAtxG9bTaxiVYL8VddMFjHCUo3kXeY2JRYFCieY8 3fUw== 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:mime-version:content-transfer-encoding; bh=itDJZjFFgEhRSTkYYv8ljT67JkqTdrMRXTGjjJSCeDY=; b=aLYnLpGRpq0EiR1CAZDV5cjGFDvgFByzL+gYOl7WJhPQoVRM+t82M1KSTf00uuBzjw 4dc4wqVgyHSqsLuGaghf9EZ2EIpsLscB6LiOuLD7NxhsGEea4xeXAR7SZ2BAa0TVFOMz fG9EaKf2yHskTXfmyJcCnq3/b0jcPw6/tke3nEABSF7JI+Xau10qZzULMa6yBP2ANaiH IJ+9SM5K4pV/ifBiZNVSvmanmvf2wEFJ0UbKnJR6lsKaGHGJGTF9qrDVdkebO8tdrEIL 08kqZuaWVeWROBDEfVz7F2eqxASXjZ98OC3XhIC82TvrH2o+L1iKBqHoQc5C1j6Dv9p2 gShg== X-Gm-Message-State: AOAM533zFhaOSXMQhUHzs4Dao0vv9ztrAx9slk6eVdfn1r2+5ApBxdiv k7igSlcAk8vvyLZaW5cg94d7lA== X-Received: by 2002:a5d:678b:: with SMTP id v11mr30127592wru.219.1620122552593; Tue, 04 May 2021 03:02:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f18sm1812889wmg.26.2021.05.04.03.02.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3FD11FF90; Tue, 4 May 2021 11:02:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/30] tests/docker: allow "update" to add the current user Date: Tue, 4 May 2021 11:01:57 +0100 Message-Id: <20210504100223.25427-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The current user functionality is used for cross compiling to avoid complications with permissions when building test programs. However for images that come from the registry we still need the ability to add the user after the fact. Reviewed-by: Willian Rampazzo Signed-off-by: Alex Bennée --- tests/docker/docker.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 9b3425fec2..7a14058801 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -517,7 +517,7 @@ def run(self, args, argv): class UpdateCommand(SubCommand): - """ Update a docker image with new executables. Args: """ + """ Update a docker image. Args: """ name = "update" def args(self, parser): @@ -525,6 +525,9 @@ def args(self, parser): help="Image Tag") parser.add_argument("--executable", help="Executable to copy") + parser.add_argument("--add-current-user", "-u", dest="user", + action="store_true", + help="Add the current user to image's passwd") def run(self, args, argv): # Create a temporary tarball with our whole build context and @@ -564,6 +567,13 @@ def run(self, args, argv): df.write(u"ADD . /\n") + if args.user: + uid = os.getuid() + uname = getpwuid(uid).pw_name + df.write("\n") + df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" % + (uname, uid, uname)) + df_bytes = BytesIO(bytes(df.getvalue(), "UTF-8")) df_tar = TarInfo(name="Dockerfile") From patchwork Tue May 4 10:01:58 2021 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: 430838 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3647892jao; Tue, 4 May 2021 03:12:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw796DE/b0Dhx34CG4WfNB7mijOyqV5epkQBTVkgR5onoiJ95gbSDzcleDRFMXRAU39WqN5 X-Received: by 2002:ab0:3c8c:: with SMTP id a12mr19615653uax.28.1620123123851; Tue, 04 May 2021 03:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123123; cv=none; d=google.com; s=arc-20160816; b=el2wCMPHM0ocU7cHlxY2A61/RF4u4H+UZVQaSLJlmdMvuBre+ThlUwoFMcEyIC1vEG NUbanHuR2zfkbJnF8lE5ZpxYyA4cMWQs3HQ2HT2eNzQK5bacq0jF+EqGUySAcxQxWPGR o5uEeMAUv5DtgbPIgFeCjo5oKuaarkeD00kMnjGKYJDuA39SYkmlbqFKRdtTOM6kJ+zl cvnfABRSD/xXvRfv15twdLhv+bv9a+tS2eAAQkUC8/Ik6is7jq4C7tcb/srcZKLkp3tW lxOf9p7w/pVcyYmRI0MfPbXLtsYDvjZdQiCIgmGG/0PI8oiAKP0bDmI9OGLhYgyI9aZd DfFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=89FGk/7QSTLsW61jmi4iC132gql+p7Aet7f7N9abrBY=; b=uRip1S9LaLfRYEDwRR1TDGRYghR0e55OU0Vp9hPwNPSCbjHmeyVcRzo54dut5Y82tX Zn2gza/cfLP2D436QquaD5zJZkab2AyYAbsucIU0RxeG37Or6mGIMcK/acIHtfRl5v00 gbF3hAKtBYGpI/uHtnc3vBXRmSRSwD97fWAcBG0BYnWxTjCOt5BGZ9/BWpQfHobXomIl lcHQaOl9AZsfAF7CqSsLe+16BN1Q2PannPpLc1+4AYiKnqWkmts6So9ysK77g+3G1F61 /7PMszurHE74N3VgMedNFriVtzXsjQAMsS0Oia2gyViCBiNCri73tS5USL0oXm7FQUng 5X4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U1249CTF; 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=fail (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 l12si1458668vsh.113.2021.05.04.03.12.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:12:03 -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=fail header.i=@linaro.org header.s=google header.b=U1249CTF; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds27-0004ZM-9U for patch@linaro.org; Tue, 04 May 2021 06:12:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrsz-0002V0-QQ for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:37 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:39506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrsy-00037r-2R for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:37 -0400 Received: by mail-wr1-x429.google.com with SMTP id v12so8693010wrq.6 for ; Tue, 04 May 2021 03:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=89FGk/7QSTLsW61jmi4iC132gql+p7Aet7f7N9abrBY=; b=U1249CTFphaPEBl7URrQajoY/q+Njr/qyVEqQ/ZZPBAgUHnqOPOGQS96C43BfdGahS wVcCd2ZLFPLEXZ/k9LiaDB4IfDEQStI+R5iMz6jCJhe/oW7taXrvNCYZe9BGlI6B6Nl5 DKwp+FUHa1TWx5NHs+NV6LJxsj6zi0DJpaQqIhjhH4zoPIlmNfvc4T81ZyHV9CHGIYxN S1z4+8sHV8yE0c5fcd3RWJPxTqGGiU3Sbxzck69awwZA1qxU7fYWpaqZ4DT3gL1XpTBO 0vRuEBf6WcLP/K8pwrbFM1cjmpPAArfFUY5wjTXt5YOTVoNgOklbgGwEpmnUlzGjybIU Sihg== 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:mime-version:content-transfer-encoding; bh=89FGk/7QSTLsW61jmi4iC132gql+p7Aet7f7N9abrBY=; b=GcLxJPZRzQvb85ZejFy2BrKO4JDEMkP7zhmpj23cOfborvCU3uNyqPeqyFTrWisPOB Fug1p4cgigzIqd+KGXIjIbb3U3E/x7VLVlmA0HOzjtMP8YKrrK3twfzk4tnPtDcY/LFK gNhRypI4o9ydtE8VC8DlrxfEXS0qbCPpPADJZoXLcgthmTlWTiJDkhq6/BfY9/W3DEnR Aif50l1cA8bcHSHs8PC5YYdAZbxh1XY1utYX+Ggff/SCMcWKVVMhT2f7dWzRUgtvLYku WRY2QadrhHpG2VbHyrlHygqZdKSHcucS3fmGysNkS3rsiBZcyXjVEgGXpC6I2Et32boC pW4w== X-Gm-Message-State: AOAM530Fhs5YSzNusRk7rUSNhRnmCqaSREIzOUsALjLm0WmWzgv3QRkV SQSBJKZnaHLoJXWuuh/llPC7xg== X-Received: by 2002:a5d:4a46:: with SMTP id v6mr30375717wrs.134.1620122554683; Tue, 04 May 2021 03:02:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o15sm5826361wru.42.2021.05.04.03.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0926A1FF91; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/30] tests/docker: add "fetch" sub-command Date: Tue, 4 May 2021 11:01:58 +0100 Message-Id: <20210504100223.25427-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This simply wraps up fetching a build from the registry and tagging it as the local build. Reviewed-by: Willian Rampazzo Signed-off-by: Alex Bennée --- tests/docker/docker.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 7a14058801..4d9bb7c7ed 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -515,6 +515,23 @@ def run(self, args, argv): return 0 +class FetchCommand(SubCommand): + """ Fetch a docker image from the registry. Args: """ + name = "fetch" + + def args(self, parser): + parser.add_argument("tag", + help="Local tag for image") + parser.add_argument("registry", + help="Docker registry") + + def run(self, args, argv): + dkr = Docker() + dkr.command(cmd="pull", quiet=args.quiet, + argv=["%s/%s" % (args.registry, args.tag)]) + dkr.command(cmd="tag", quiet=args.quiet, + argv=["%s/%s" % (args.registry, args.tag), args.tag]) + class UpdateCommand(SubCommand): """ Update a docker image. Args: """ From patchwork Tue May 4 10:01:59 2021 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: 430841 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3648583jao; Tue, 4 May 2021 03:13:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1v+L2pesvs9mF/Is50rXManMf+SiuohrmUgmAoQ5l3Et2r73I9cPL8pH8ZikRFG3WeHVo X-Received: by 2002:a05:6102:48d:: with SMTP id n13mr21112546vsa.51.1620123181965; Tue, 04 May 2021 03:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123181; cv=none; d=google.com; s=arc-20160816; b=WIlULZ6NmsjpHi6wxgE5ouO6HcrzPNaFxsuaNRsihEA7APHnEBq5mZeobY2I3xCu6r CIwEomvo7sMU/1A482jTm2K1HzMTsWrzT5/wADsafPLDKJ24bMICxX38sUDw3wfIcOE7 OPeBKXHP+DLoTcArZKuo0d/ho3+/ZOM6ZG90PH1xXMYy5WaCECrZtTilF62ZhHZKiPY8 RSEBWkj0Li3rXmtTaaLZMiysPE1HHg3Z6J4HwhrE7OV6taz5jrPOkic523W1dRZJM1MX p+lf3EMtNDzW7tdpcUpD/La0I8DZ+ITd7BDfEdgAodIbprGmyJvqpzRMrLXRlVo5zFEx Vm/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=zq9pf5DG8V5vMc7amFGa4NoW/s1JTFqZzk4bYCvMifc=; b=t8A1sctSSp/zBk2PyFIbJTv5OP8mWAomQEigpMhY0em7OwKEZsloQya4Vj7bSKDejf Cj9PEjixF678O3lCkHR9EugPPHSJzNimNua64pLNbcoueS357jYjwYYaw6VE1+XNVFKD 2fEOusl16eNSda8q1ZLmBZLgZjUq+181jwdtadHOwKEdlX36QZ8Cd8UvcvSkxOGts+Mj D4ADKbj00IDLbDzs+8CgKxqJf/AuxVgvDbtOe9uTf9T41RHNLTU7a6WcFp8zTiQcfN8M yNB9eMoOqtIgWv4fyDCLCnqKx0pPTGEYNQOkaKEF/hUuQ5hDStf+UFWBQEZH3x3entkc HN+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Qxfr0TqV; 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=fail (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 y5si1885532uao.90.2021.05.04.03.13.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:13:01 -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=fail header.i=@linaro.org header.s=google header.b=Qxfr0TqV; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds33-0005zb-9X for patch@linaro.org; Tue, 04 May 2021 06:13:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrt4-0002cx-Mh for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:42 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:41524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrt1-00039z-0l for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:42 -0400 Received: by mail-wr1-x42a.google.com with SMTP id d11so8709515wrw.8 for ; Tue, 04 May 2021 03:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zq9pf5DG8V5vMc7amFGa4NoW/s1JTFqZzk4bYCvMifc=; b=Qxfr0TqVrL3KxusF8ryk9KwFldsOQGWD5J/hhnm8nJZ+SM+OE9iemtNkR2ZEp52nTf iAqjB9L3rdOXtlPCzyHYjnvQsctgUfWb3bTvGtJ/bgNiIFU+1YDp1Ul7qZ8GLrpVkrh0 zJ9R+NfK8J2kT8YJetYj99hYJjszQq8Mkw7tYzK9YbH9wLfuBwsdAEVSDWoYsrfPXm5c tbpFdlG8PcyXyf1+3DqGMwQoykbzIElKeIttTvrFX8jfSKAbyCDtEERHkSHS6GNxWav8 bBzxSIPFY7KvTP8R6/vLjBl+/8u4j8+z6N8P5SGkZDV1QYFcLUeQnn+2D8NXU+/QLdh8 QjGw== 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:mime-version:content-transfer-encoding; bh=zq9pf5DG8V5vMc7amFGa4NoW/s1JTFqZzk4bYCvMifc=; b=Y0HQQSeJcRvFrcqpizcmUAJ1696SIyGFmwxTyQr+aTgwx8MDzmdF8tDiR6k6IpCurJ u7bwpjKj8XQ6xg1ly6L8ZxEzj1Zoxa/F1Jzq1D8RqcvidmpqfKKK+4MFZIXjDs2dPhsu HkDhYCWZwpFf+wb62rzx04k5OWYHiQ3p+YUAvXKYMPsUoAdisVU98UatPT9SlEqA+hAM gVOWM3z3ZcBtmwFG9+yQuAu0vaG9iiF/qNvcR0Fyr0vz8hVfqr9Dztq2bWI0GtWGcpGL CkDTyYpCbYJDUG8HnFsOa4ZxuPM+vx547rkJAlb5bMkplWIbdUpFfqw+OO4ne+D3ntIT aNUg== X-Gm-Message-State: AOAM531dxyQgOVTXbf8J+3ZwNZvskQ1BMEquE+2pqvC6dpt9wNkkLmbh rBL6uVM/YfpuiszJax6GqWEtdw== X-Received: by 2002:a5d:590a:: with SMTP id v10mr30728763wrd.306.1620122557651; Tue, 04 May 2021 03:02:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y21sm1956222wmi.15.2021.05.04.03.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2BBD41FF92; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/30] docker: Add Hexagon image Date: Tue, 4 May 2021 11:01:59 +0100 Message-Id: <20210504100223.25427-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Alessandro Di Federico , Thomas Huth , berrange@redhat.com, Brian Cain , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alessandro Di Federico This image is a little special because it takes a long time to build. As such most users don't want to be doing that and just pull random binaries from the ether as intended by the container gods. This involves someone with credentials and a beefy machine running: make docker-image-debian-hexagon-cross V=1 NOCACHE=1 J=30 docker tag qemu/debian-hexagon-cross registry.gitlab.com/qemu-project/qemu/qemu/debian-hexagon-cross docker push registry.gitlab.com/qemu-project/qemu/qemu/debian-hexagon-cross With a suitable binary in the "cloud" a normal user will run: make docker-image-debian-hexagon-cross or have it run for them through the dependency mechanism of our over-engineered makefiles and get the binary they wanted. There are a few wrinkles of course including needing to tweak the final image to have the credentials of the user so we can actually do our cross compiles. Tested-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Signed-off-by: Alex Bennée Cc: Alessandro Di Federico Cc: Philippe Mathieu-Daudé Cc: Brian Cain --- vAJB: - dropped all r-b/sob due to rewrite - split into a multi-stage dockerfile - make dockerfile standalone - play fugly make games v2 - update LLVM version per BN7PR02MB4194DF5752EF3BADE858018DB8799@BN7PR02MB4194.namprd02.prod.outlook.com --- MAINTAINERS | 2 + tests/docker/Makefile.include | 22 +++ .../dockerfiles/debian-hexagon-cross.docker | 44 ++++++ .../build-toolchain.sh | 141 ++++++++++++++++++ 4 files changed, 209 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-hexagon-cross.docker create mode 100755 tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index 4c05ff8bba..fc0b429b45 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -197,6 +197,8 @@ F: linux-user/hexagon/ F: tests/tcg/hexagon/ F: disas/hexagon.c F: default-configs/targets/hexagon-linux-user.mak +F: docker/dockerfiles/debian-hexagon-cross.docker +F: docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh HPPA (PA-RISC) TCG CPUs M: Richard Henderson diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 820423d718..8967ecf118 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -148,6 +148,28 @@ docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 +# +# The build rule for hexagon-cross is special in so far for most of +# the time we don't want to build it. While dockers caching does avoid +# this most of the time sometimes we want to force the issue. +# +docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker + $(if $(NOCACHE), \ + $(call quiet-command, \ + $(DOCKER_SCRIPT) build -t qemu/debian-hexagon-cross -f $< \ + $(if $V,,--quiet) --no-cache \ + --registry $(DOCKER_REGISTRY) --extra-files \ + $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker.d/build-toolchain.sh, \ + "BUILD", "debian-hexagon-cross"), \ + $(call quiet-command, \ + $(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \ + qemu/debian-hexagon-cross $(DOCKER_REGISTRY), \ + "FETCH", "debian-hexagon-cross") \ + $(call quiet-command, \ + $(DOCKER_SCRIPT) update $(if $V,,--quiet) \ + qemu/debian-hexagon-cross --add-current-user, \ + "PREPARE", "debian-hexagon-cross")) + # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker new file mode 100644 index 0000000000..1d19e8f29c --- /dev/null +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -0,0 +1,44 @@ +# +# Docker Hexagon cross-compiler target +# +# This docker target is used for building hexagon tests. As it also +# needs to be able to build QEMU itself in CI we include it's +# build-deps. It is also a "stand-alone" image so as not to be +# triggered by re-builds on other base images given it takes a long +# time to build. +# +FROM qemu/debian10 + +# Install common build utilities +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + cmake \ + flex \ + lld \ + rsync \ + wget + +ENV TOOLCHAIN_INSTALL /usr/local +ENV ROOTFS /usr/local + +ENV LLVM_URL https://github.com/llvm/llvm-project/archive/bfcd21876adc3498065e4da92799f613e730d475.tar.gz +ENV MUSL_URL https://github.com/quic/musl/archive/aff74b395fbf59cd7e93b3691905aa1af6c0778c.tar.gz +ENV LINUX_URL https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz + +ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh + +RUN cd /root/hexagon-toolchain && ./build-toolchain.sh + +FROM debian:buster-slim +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +# Install QEMU build deps for use in CI +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy --arch-only qemu +COPY --from=0 /usr/local /usr/local +ENV PATH $PATH:/usr/local/bin/ diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh new file mode 100755 index 0000000000..19b1c9f83e --- /dev/null +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh @@ -0,0 +1,141 @@ +#!/bin/bash + +set -e + +BASE=$(readlink -f ${PWD}) + +TOOLCHAIN_INSTALL=$(readlink -f "$TOOLCHAIN_INSTALL") +ROOTFS=$(readlink -f "$ROOTFS") + +TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin +HEX_SYSROOT=${TOOLCHAIN_INSTALL}/hexagon-unknown-linux-musl +HEX_TOOLS_TARGET_BASE=${HEX_SYSROOT}/usr + +function cdp() { + DIR="$1" + mkdir -p "$DIR" + cd "$DIR" +} + +function fetch() { + DIR="$1" + URL="$2" + TEMP="$(readlink -f "$PWD/tmp.tar.gz")" + wget --quiet "$URL" -O "$TEMP" + cdp "$DIR" + tar xaf "$TEMP" --strip-components=1 + rm "$TEMP" + cd - +} + +build_llvm_clang() { + fetch "$BASE/llvm-project" "$LLVM_URL" + cdp "$BASE/build-llvm" + + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN_INSTALL} \ + -DLLVM_ENABLE_LLD=ON \ + -DLLVM_TARGETS_TO_BUILD="Hexagon" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ + "$BASE/llvm-project/llvm" + ninja all install + cd ${TOOLCHAIN_BIN} + ln -sf clang hexagon-unknown-linux-musl-clang + ln -sf clang++ hexagon-unknown-linux-musl-clang++ + ln -sf llvm-ar hexagon-unknown-linux-musl-ar + ln -sf llvm-objdump hexagon-unknown-linux-musl-objdump + ln -sf llvm-objcopy hexagon-unknown-linux-musl-objcopy + ln -sf llvm-readelf hexagon-unknown-linux-musl-readelf + ln -sf llvm-ranlib hexagon-unknown-linux-musl-ranlib + + # workaround for now: + cat < hexagon-unknown-linux-musl.cfg +-G0 --sysroot=${HEX_SYSROOT} +EOF +} + +build_clang_rt() { + cdp "$BASE/build-clang_rt" + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_CONFIG_PATH="$BASE/build-llvm/bin/llvm-config" \ + -DCMAKE_ASM_FLAGS="-G0 -mlong-calls -fno-pic --target=hexagon-unknown-linux-musl " \ + -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_C_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ + -DCMAKE_ASM_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ + -DCMAKE_INSTALL_PREFIX=${HEX_TOOLS_TARGET_BASE} \ + -DCMAKE_CROSSCOMPILING=ON \ + -DCMAKE_C_COMPILER_FORCED=ON \ + -DCMAKE_CXX_COMPILER_FORCED=ON \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILTINS_ENABLE_PIC=OFF \ + -DCMAKE_SIZEOF_VOID_P=4 \ + -DCOMPILER_RT_OS_DIR= \ + -DCAN_TARGET_hexagon=1 \ + -DCAN_TARGET_x86_64=0 \ + -DCOMPILER_RT_SUPPORTED_ARCH=hexagon \ + -DLLVM_ENABLE_PROJECTS="compiler-rt" \ + "$BASE/llvm-project/compiler-rt" + ninja install-compiler-rt +} + +build_musl_headers() { + fetch "$BASE/musl" "$MUSL_URL" + cd "$BASE/musl" + make clean + CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ + CROSS_COMPILE=hexagon-unknown-linux-musl \ + LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ + CROSS_CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ + ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} + PATH=${TOOLCHAIN_BIN}:$PATH make CROSS_COMPILE= install-headers + + cd ${HEX_SYSROOT}/.. + ln -sf hexagon-unknown-linux-musl hexagon +} + +build_kernel_headers() { + fetch "$BASE/linux" "$LINUX_URL" + mkdir -p "$BASE/build-linux" + cd "$BASE/linux" + make O=../build-linux ARCH=hexagon \ + KBUILD_CFLAGS_KERNEL="-mlong-calls" \ + CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ + LD=${TOOLCHAIN_BIN}/ld.lld \ + KBUILD_VERBOSE=1 comet_defconfig + make mrproper + + cd "$BASE/build-linux" + make \ + ARCH=hexagon \ + CC=${TOOLCHAIN_BIN}/clang \ + INSTALL_HDR_PATH=${HEX_TOOLS_TARGET_BASE} \ + V=1 \ + headers_install +} + +build_musl() { + cd "$BASE/musl" + make clean + CROSS_COMPILE=hexagon-unknown-linux-musl- \ + AR=llvm-ar \ + RANLIB=llvm-ranlib \ + STRIP=llvm-strip \ + CC=clang \ + LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ + CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ + ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} + PATH=${TOOLCHAIN_BIN}/:$PATH make CROSS_COMPILE= install + cd ${HEX_TOOLS_TARGET_BASE}/lib + ln -sf libc.so ld-musl-hexagon.so + ln -sf ld-musl-hexagon.so ld-musl-hexagon.so.1 + cdp ${HEX_TOOLS_TARGET_BASE}/../lib + ln -sf ../usr/lib/ld-musl-hexagon.so.1 +} + +build_llvm_clang +build_kernel_headers +build_musl_headers +build_clang_rt +build_musl From patchwork Tue May 4 10:02:00 2021 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: 430845 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3651006jao; Tue, 4 May 2021 03:16:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwn7UlN7GJ9lJKTPSUM8ppJJxSOgny9wJNBzZ76L1H5zeR43fmPS0XBLBnHLA5qcIQD89EM X-Received: by 2002:a1f:1d4a:: with SMTP id d71mr4036653vkd.0.1620123369251; Tue, 04 May 2021 03:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123369; cv=none; d=google.com; s=arc-20160816; b=JhNgKfQEFESrMa9MhGlFINv9SI2qeT+qnF11mVrTLwqCw83gzs/vDosOgpYq7f6721 ajc8ca3ArI3BRF4/e1ae3b3aIpEnYd+eyZX09N/9TvVCsaXHVxdT3lb+0kXPWDie4z5F JbHwqB8UdieA50XpN2r6DsMPcTDWnRhtCs829547VSt1hkIg3bmxjdyJz2gq2YnorKE4 igzcYeQ9kapZ2XG8ZwYe07UOrYzx9CsTBWNntfP2bmIDP8JZm7FcfINx2iBbLLCebsPL PbDLRSnHvhqDwPrHt5LH0cpOKnZfHVo7pKtnePuVSq+egbVKQNdjBcBMbYZhIfJdBay4 ekag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=OWsxh1O/PCMLIPJdNYGt0wcTu1m8kvjY7RzHMHd8hQY=; b=NvreEAJxEOIBoR4kCay/xxQhhZ4A9J2GWu7HLTUE8mv2KmhGjc4xvMg/l7nFVsnAu4 HuVAzgJ+BDdFIeBXU4jvfJDWmtMBNj+tuhBkifd6IErKaBjfQFXKhxjzvGHM/R64M4RK 57IHEX52CuuwBEOgo0AsEdz4OnLTawej2+wuH6PI+VMTSHb+qJjGQWwPawm3IzjnTmRC v6V4uqxuatO/VDerycbYChb8f1a6O4bdLuA+pFSmEenhAyQpDe4m2hyrIpRJ9qlLySSS nSvxvglqPEi4oIAdYymVfIsUb7DBSmD6nV8D9m6RFZE6MmyCSPSiTx/CU7jbqrcNmBhr znHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iwubV8+E; 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=fail (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 m12si6845777vsp.205.2021.05.04.03.16.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:16:09 -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=fail header.i=@linaro.org header.s=google header.b=iwubV8+E; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds64-00013P-JH for patch@linaro.org; Tue, 04 May 2021 06:16:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrt6-0002gV-WD for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:45 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:41806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrt1-0003Aw-Rt for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:44 -0400 Received: by mail-wm1-x335.google.com with SMTP id t11-20020a05600c198bb02901476e13296aso980853wmq.0 for ; Tue, 04 May 2021 03:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OWsxh1O/PCMLIPJdNYGt0wcTu1m8kvjY7RzHMHd8hQY=; b=iwubV8+E5qgI0J9za3n3PKIDyjmnMHO0HzNz+A5im7cS/TLLgnMl+zavlQbJ9Z/d/B mzcY1ZDVayefevvtJJhGVDur7jr+ACKzFFV3yadFlw5jyLUiz2cQBVL3SdS5E+DZpFDh ENoh57/oE1vehnE73J3gRFztzElIX1wG1ESw8cQOslzHdEyPcEd4RRUW3o5OeJNgkv31 3fnFSDbwm+tltp4aO70++z0wi5LIkeI58hG1e6l4nPpWaHvlGgnGFhfxvtpy8WBqZ2em mcw7R54KP3rqxUPPyaNtWpimsK/nptXCFI9dIaNaZEZIdYnm1oRwMIJNWX7SWdGDdwpb DneQ== 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:mime-version:content-transfer-encoding; bh=OWsxh1O/PCMLIPJdNYGt0wcTu1m8kvjY7RzHMHd8hQY=; b=Y6pndg+b0KJ1CAfIz+EBvxalhYr5pmRZthFAMOkCnlRFEEKsCS/Ba9zwdoHgmdfs9G cDKj3KIhCOkrehRi0bZWZRdB3xLAryNGcKLdOqDgQp9Qj4kSJ0cbpsrIye2RQyOSRv1O X86jh9+9bwCKvFqd0NDg4OodkMdLufsBVBo/pnAMMiY9vvEDvmgLXcjdydDX/vJDz2wf y9B2SM9ANyjpAjS3g9s9irCIF6tO9YKaOyJF7wG3zTOzn+trRpojLZE8AfuZgV2TA1X1 X26BWHIUBwCc5FEULcQwn2telMpZ6UVIelphYIYMg25O2xt4oQ84vkkGoI4mgj2IepH0 E12Q== X-Gm-Message-State: AOAM531f56quIAVrOx2/VObUF/1MMhrq76z3urqWaYOEbGL7wnsMOMey Sj7ACGt9maboB3u6z2DY1lZIsw== X-Received: by 2002:a7b:c20e:: with SMTP id x14mr25942046wmi.57.1620122558567; Tue, 04 May 2021 03:02:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm2563531wmb.32.2021.05.04.03.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 435591FF93; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/30] tests/tcg: Use Hexagon Docker image Date: Tue, 4 May 2021 11:02:00 +0100 Message-Id: <20210504100223.25427-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Alessandro Di Federico , berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alessandro Di Federico [PMD: Split from 'Add Hexagon Docker image' patch] Signed-off-by: Alessandro Di Federico Signed-off-by: Philippe Mathieu-Daudé [AJB: add container_hosts] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20210228222314.304787-5-f4bug@amsat.org> Message-Id: <20210305092328.31792-6-alex.bennee@linaro.org> --- tests/tcg/configure.sh | 5 +++++ 1 file changed, 5 insertions(+) -- 2.20.1 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index fa1a4261a4..24cc847688 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -128,6 +128,11 @@ for target in $target_list; do container_image=fedora-cris-cross container_cross_cc=cris-linux-gnu-gcc ;; + hexagon-*) + container_hosts=x86_64 + container_image=debian-hexagon-cross + container_cross_cc=hexagon-unknown-linux-musl-clang + ;; hppa-*) container_hosts=x86_64 container_image=debian-hppa-cross From patchwork Tue May 4 10:02:01 2021 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: 430837 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3646918jao; Tue, 4 May 2021 03:10:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztKXUFc4p8gtShkKYlIJyaSI6VBzbP3aaCEHN+URLN0GsBpMDoA/A8/H+7qyFt1qttphNz X-Received: by 2002:a02:308e:: with SMTP id q136mr23188874jaq.47.1620123040604; Tue, 04 May 2021 03:10:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123040; cv=none; d=google.com; s=arc-20160816; b=BMlTX80XYuSJ8ND+rfoQr/sTwQjyahIUubZ3D6PiHY19T2XMT0Qtd5JY6YCR+v/nBm zCkqwIbAgRtp3V4XM4QsQwjOhH5Q7zDAyxFdawYbY6HT5ZnkVaccvBOhgKPCcY+GcEFp Sb60qytoUgInbmGJb/Oc9vCFGdBhB4s29T1pnFxrxYC1+0XtdRwlKlRbl/Z2shoL+rOf etCVkFYooooSt4nMP3ElNIGi2zBniwG6MnGt9e8Y53owB8RRYvBrTaweHO57VaC+RqUx LKnd9JLu657bnPuL5OQqXsA9ce9PzVSOy0FMk0QnMuTaYlIUeHQletl4BgdCupW71OxT eXTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=AwczTv5129u5O7lJOfx5qiNR/mY52Y2070Oy1pXCw8c=; b=KldVfC/P02UBcXF360zlukZR457S6bAMHabkRMiZQSIQD57hIYE+m95t4o297lmWBS /PBmDl9NgjsF2Rhkuv8ztI0nSQ+M10bpKBsPj8oEiO+oWVXNtL7RPFK+lXtVaNWDl3hN oQi7DxJ/ZwqeDlvIaeiFJKlHghd8vUWAfyydDrUihHxBeQtE3kKCcvDBrP8SJBbFeohe 8GDt9sVJp3wW7HVduRd6EnW9aTmeG2zZ2eprtbg/cCFaQPHOcQk8jPbvXkdFv+Vd9P4o K/dMDJbYut9ywWGdJo5CZwuMYWwO9nbESf1Izl1ATveMnkZU2HZ4MBYAbZxZFD5pSaXY WV1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IYIBqAgD; 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=fail (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 d7si18275735ilg.78.2021.05.04.03.10.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:10:40 -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=fail header.i=@linaro.org header.s=google header.b=IYIBqAgD; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds0j-0002Oj-D3 for patch@linaro.org; Tue, 04 May 2021 06:10:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrt0-0002Wc-KZ for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:38 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrsy-000395-UE for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:38 -0400 Received: by mail-wr1-x42c.google.com with SMTP id l2so8703562wrm.9 for ; Tue, 04 May 2021 03:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AwczTv5129u5O7lJOfx5qiNR/mY52Y2070Oy1pXCw8c=; b=IYIBqAgDL07hOg5ABqIvhtNUaUVpxnQo9C+viwLVGCHRYFNusaK4W9bVRx97YnGglg uGIepz0dRmJaGgS9Iq2j329Q2TkSBOFy5vm3IAq5jRkit8kqjIAz22AITjLowYkEoe7c j77ofzLqByPjVX2LET4mSXdkav8uJ989qjE0EvZf3ZFGDVaj81i36EZdXiJTDBs9UL6P lY7YoedCrIqPyP/Dya6YpC4XnVYeneDMuK6jt9kxnp2qTUyPKkRqRgBuoR0CSwoMf2nS wMsft80AQnDAWK8Tg3WWVZnbgJbNe/BJjEsR1rIKbdhvRF2VNOh5SdAelANm61atBxXh Iw8A== 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:mime-version:content-transfer-encoding; bh=AwczTv5129u5O7lJOfx5qiNR/mY52Y2070Oy1pXCw8c=; b=QaVuiXfZ65Ld05KBqjoVewP6QpJRxLPio/SnVqQAFOJCcn0upBOzC9T1wZrtA0mMWG CoMXbvfFqYjfxiUK5XeEK4lwZq476ihU3zl4fSBsyWM2440J/vndzeK65syzo7J3SqH/ N4cRi1WBK9FPSSiglQ21xAWKXmcFO2oP2gVEyZqMOw94cBppF8HyEncUZeHtSZmjMelC qfEtX2lGn+MY9qqQqMunWVb8zx+rm5fqWtg0LZRLyLnXVOkn7MGL/DjhGGJtnWwTNmiI omHxgVKx4bLQc/4uu7RDSu8d8GIcWJa4hSPFdwSwZZAVLw5Xxtqx8dEfDmHF1kyyfG++ WGKA== X-Gm-Message-State: AOAM533xnYgk5FxEZLiAy37CMcNZpE5yvuP0yLOHx9FSN3Li/aMq31ud lDVCBXj064s51qFqNC3pqdScQQ== X-Received: by 2002:adf:ffc4:: with SMTP id x4mr30016366wrs.415.1620122555642; Tue, 04 May 2021 03:02:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t2sm1981672wmg.38.2021.05.04.03.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5F7951FF96; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/30] gitlab: add build-user-hexagon test Date: Tue, 4 May 2021 11:02:01 +0100 Message-Id: <20210504100223.25427-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We special case this as the container with the cross compiler for the tests takes so long to build it is manually uploaded into the registry. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Tested-by: Philippe Mathieu-Daudé Message-Id: <20210305092328.31792-7-alex.bennee@linaro.org> --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.20.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52d65d6c04..87d1172b03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -413,6 +413,17 @@ build-user-static: CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg +# Because the hexagon cross-compiler takes so long to build we don't rely +# on the CI system to build it and hence this job has no dependency +# declared. The image is manually uploaded. +build-user-hexagon: + <<: *native_build_job_definition + variables: + IMAGE: debian-hexagon-cross + TARGETS: hexagon-linux-user + CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg + MAKE_CHECK_ARGS: check-tcg + # Only build the softmmu targets we have check-tcg tests for build-some-softmmu: <<: *native_build_job_definition From patchwork Tue May 4 10:02:02 2021 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: 430830 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3641799jao; Tue, 4 May 2021 03:03:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3MdFY/zmbk11+9bsXIR7Z3bk2k+sUlRtCfNbA5Qxu99AFRCj5IZKFPGVecEPRHQXxflup X-Received: by 2002:a17:906:a956:: with SMTP id hh22mr2497049ejb.335.1620122621730; Tue, 04 May 2021 03:03:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122621; cv=none; d=google.com; s=arc-20160816; b=OL4dPkqS8Z9gLhyNhBtQUjSz7HCDIxHHMJlRlngs7zV/losjxmT/BwOFSfF4+i1qIi sd+aDCL56YkP2Q0l8vVuAGTiirstJVQrRPofbro2sVThgIKTp+lJc4NzJB9CxMJK/q54 xKMm4vM/NpPP8myuHrcXxbtDLmOqbozb8ZlchWC3J4abMAECMwdRGW/cZ8YOe8BEtckY +uqac+cblDvwFGix+2q0OQjQjaTV6cdqJ42i7+iKlEr9nOU/fx1+CjDuBQAqyJpDr7HT rUQFJJAn1pGY1m//YT6PSDh6tTRbT9846CBcWf4YOhqo95BxeBOzXg9UqBtvm29qiBCH 4jPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=sPzJesUomMFY9absGAV+e0gSasa1u8Mhgwq7e7l5rQ4=; b=fyw92aV+i5tPRcJ2kz45MxgbLptjjbJSKRiS1+MyZMX1Rd2Pl5CyF/cfnxXryyOpmv 1cejVt74Q9zJFJGV9qAM/N2cMEpPnxNtaC9aSBmnC1yvD8YmCFhPuyhQV9tg3+JTvWO+ XomRlcxYP+DjXV1SHrcEPHkrMqdEPqfTbVCxWdI54IhdBEii2ObfxAN7QK3CQtD9b1zm rIXonuHiaOiyZ8FoQTPjKFF5wJDN67cXUD9dCs1801Itf/J8SJGKatKfSL7M6PpguDtR kV71PCK9B3q6zcBstmvJ/V9rUHKalvYSHy/aX+d/52A0Xg8TG2fl2IyYTsJY534mL95M 0Tow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yjkRzha7; 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=fail (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 dn20si2768748ejc.511.2021.05.04.03.03.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:03:41 -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=fail header.i=@linaro.org header.s=google header.b=yjkRzha7; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldru0-0002mo-DU for patch@linaro.org; Tue, 04 May 2021 06:03:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrt8-0002iA-5m for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:46 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:34615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrt5-0003DI-K0 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:45 -0400 Received: by mail-wr1-x42c.google.com with SMTP id t18so8722393wry.1 for ; Tue, 04 May 2021 03:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sPzJesUomMFY9absGAV+e0gSasa1u8Mhgwq7e7l5rQ4=; b=yjkRzha73zItRsAaDGhys/+ybLBws0qv+UeDr/XOWsE5+ERHERKhKXwa6Yog8P2qqR +adVbhsHOKaYA5qg8xye2NTHKl72hXo1PU/RKl+1zP0VgB4Lh347duH2xGWtkFOrNHj7 Xzv9Fo2Bu87kh+Q10XOvgWt4ZN3ltMIh884t0WKTpnQH1xyElVgu3LdDLGr11FR20UU8 F6MfWm6NC1doqDvA5oIHfp7nnpRWs3Wca5iXoGCurqfbUqW5dwnMhrzJZ7o8E4iEzJ9m VqekZNoiOchVfjc/4Gk/iAfYgnhCMC27Ag91E1Hzaqocm9QE7xYxEdHUoAdkDk+/x7k1 KXig== 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:mime-version:content-transfer-encoding; bh=sPzJesUomMFY9absGAV+e0gSasa1u8Mhgwq7e7l5rQ4=; b=hgLZ0ZAk9BVC78uD5uIf25RqoHc6mzx89zXGVPRNtx09/+ovgx/cQ5VC9SqIaSPtdT 2NWPOSu+N+tCepDxuDGoGCKsTuplwzu12CMl/DAsh0Ww2xt2HuxFoPEnbyyxEIufLv8L mfv8TUZ+8mu1MUFIyfW89fep0dFwjko7s3qgVCjMKJS+SkVtDd5f6/TSv08rcxJUOvD2 LRjagn9cZLvhGpKIVqcEbvRd+Ecg3CCc1kbiq0RvrwY6pPlbNvKiKn0EZtX3H5YiL88d 89tCAmAnZr70rTI+ZTToNoo5vuL7YWqSKiueJS5Z4KVqsHphZzg8pb+GFhm2Bq3M0TNm kUrg== X-Gm-Message-State: AOAM5330acTwYHB6dHI0JfkP+RFRWREWCt0ZZGUGqriLgf1TIUZv+LJ8 6bj/PBkkk8f1vpLnYEWAgG/0Vg== X-Received: by 2002:a5d:4d52:: with SMTP id a18mr27721628wru.45.1620122562239; Tue, 04 May 2021 03:02:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l12sm18445825wrq.36.2021.05.04.03.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 767821FF98; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/30] tests/tcg: don't iterate through other arch compilers Date: Tue, 4 May 2021 11:02:02 +0100 Message-Id: <20210504100223.25427-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There should only be one compiler per architecture. Those cases where the same compiler can deal with a different architecture should be explicitly set for both cross_cc and docker configurations. Otherwise you get strangeness like: --cross-cc-aarch64=/bin/false causing the logic to attempt to use a locally available arm-linux-gnueabihf-gcc rather than forcing the use of the docker image which is what is implied by the command line option. Signed-off-by: Alex Bennée --- tests/tcg/configure.sh | 148 ++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 89 deletions(-) -- 2.20.1 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 24cc847688..e6c1be5450 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -74,35 +74,6 @@ fi for target in $target_list; do arch=${target%%-*} - case $arch in - arm|armeb) - arches=arm - ;; - aarch64|aarch64_be) - arches="aarch64 arm" - ;; - mips*) - arches=mips - ;; - ppc*) - arches=ppc - ;; - sh4|sh4eb) - arches=sh4 - ;; - x86_64) - arches="x86_64 i386" - ;; - xtensa|xtensaeb) - arches=xtensa - ;; - alpha|cris|hexagon|hppa|i386|lm32|microblaze|microblazeel|m68k|openrisc|riscv64|s390x|sh4|sparc64) - arches=$target - ;; - *) - continue - ;; - esac container_image= case $target in @@ -236,70 +207,69 @@ for target in $target_list; do echo "CROSS_CC_GUEST_CFLAGS=$target_compiler_cflags" >> $config_target_mak got_cross_cc=no - for i in $arch $arches; do - if eval test "x\${cross_cc_$i+yes}" != xyes; then - continue - fi - eval "target_compiler=\${cross_cc_$i}" - if ! has $target_compiler; then - continue - fi - write_c_skeleton - if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC -static ; then - # For host systems we might get away with building without -static - if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC ; then - continue - fi - echo "CROSS_CC_GUEST_STATIC=y" >> $config_target_mak - else - echo "CROSS_CC_GUEST_STATIC=y" >> $config_target_mak - fi - echo "CROSS_CC_GUEST=$target_compiler" >> $config_target_mak + if eval test "x\${cross_cc_$arch}" != xyes; then + eval "target_compiler=\${cross_cc_$arch}" - # Test for compiler features for optional tests. We only do this - # for cross compilers because ensuring the docker containers based - # compilers is a requirememt for adding a new test that needs a - # compiler feature. - case $target in - aarch64-*) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=armv8.1-a+sve -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=armv8.3-a -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mbranch-protection=standard -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=armv8.5-a+memtag -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak - fi - ;; - ppc*) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mpower8-vector -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak - fi - ;; - i386-linux-user) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -Werror -fno-pie -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak - fi - ;; - esac + if has $target_compiler; then + write_c_skeleton + if ! do_compiler "$target_compiler" $target_compiler_cflags \ + -o $TMPE $TMPC -static ; then + # For host systems we might get away with building without -static + if do_compiler "$target_compiler" $target_compiler_cflags \ + -o $TMPE $TMPC ; then + got_cross_cc=yes + echo "CROSS_CC_GUEST_STATIC=y" >> $config_target_mak + echo "CROSS_CC_GUEST=$target_compiler" >> $config_target_mak + fi + else + got_cross_cc=yes + echo "CROSS_CC_GUEST_STATIC=y" >> $config_target_mak + echo "CROSS_CC_GUEST=$target_compiler" >> $config_target_mak + fi + fi + fi - enabled_cross_compilers="$enabled_cross_compilers $target_compiler" - got_cross_cc=yes - break - done + if test $got_cross_cc = yes; then + # Test for compiler features for optional tests. We only do this + # for cross compilers because ensuring the docker containers based + # compilers is a requirememt for adding a new test that needs a + # compiler feature. - if test $got_cross_cc = no && test "$container" != no && test -n "$container_image"; then + case $target in + aarch64-*) + if do_compiler "$target_compiler" $target_compiler_cflags \ + -march=armv8.1-a+sve -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak + fi + if do_compiler "$target_compiler" $target_compiler_cflags \ + -march=armv8.3-a -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak + fi + if do_compiler "$target_compiler" $target_compiler_cflags \ + -mbranch-protection=standard -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak + fi + if do_compiler "$target_compiler" $target_compiler_cflags \ + -march=armv8.5-a+memtag -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak + fi + ;; + ppc*) + if do_compiler "$target_compiler" $target_compiler_cflags \ + -mpower8-vector -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak + fi + ;; + i386-linux-user) + if do_compiler "$target_compiler" $target_compiler_cflags \ + -Werror -fno-pie -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak + fi + ;; + esac + elif test $got_cross_cc = no && test "$container" != no && \ + test -n "$container_image"; then for host in $container_hosts; do if test "$host" = "$ARCH"; then echo "DOCKER_IMAGE=$container_image" >> $config_target_mak From patchwork Tue May 4 10:02:03 2021 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: 430829 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3641795jao; Tue, 4 May 2021 03:03:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpKq4Aa4yHbJY7g3ACGsp9azhsm/WzG8TNT1ZNOJ2abXdQRZfc+kaaymNUt/MERAY382ED X-Received: by 2002:a17:906:c827:: with SMTP id dd7mr21537754ejb.225.1620122621609; Tue, 04 May 2021 03:03:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122621; cv=none; d=google.com; s=arc-20160816; b=EIOk49FUUVfHbAs4ECDud3NZrZ244uujqASOj5ojX+oapQO98FloPh31v00LLoSzBn Rik8ytofq4GdBfQ7Rkw/xkhJHXeKyLahzSpxaVTgsI6kXOpELv+0PTi1YuyElF0OsJ7k hvjhS3DH09EW0p282rA/DigW7ZO7MXTP2TnN5cDZ24pdAtdPhhYqnrm2VepLIQXJ5zA3 AXo9Q4PGmNxMTxF67f2t2jCSPYhmdAwHIknazr5XpZ/JOHLrHnzAgxE4EGqxQV6NppQU nQ8WoeKgv7FvOf9fG7J2y9m20iskKiA1Gbz3FH3UE0+dkL6PHeUa2woW37G7g6wSjpCu LE1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=+bRC0Et+Ybmra+FhUpwC3CZYHeRVawT5fsMVpUvmvv0=; b=f30UT4kfVE3LuRjvXkj98qdL+cKyvI2RAME6ojRpmr6RKzqqb5qriVs+ZeR7PW8bSc /EIRtnI60nBQtREfHB0tpAG5epXcc+OQKZFuOkntgnM2nVABRV5mMrUwnKiQeqcbNuRe vscUVfzEVO/Mr3Im6Uz1QB1azvmxIVV26whV57TcmtykXCzLnojhO+qwmjlg60WBGb8/ eZiV6pCt7qAyH3ctiivRzRMVXrHxExD+eEubjqJW6dJvXvU5TuB/bqQO8yyE1Tqo+B1K xwkdRLLMjC9axwcQn7LIgdNuke9G8K5Cg7ghFIG4LsURvO+ru/ZEy3gj3BEnVhfimEy5 B/ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="gXIogrS/"; 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=fail (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 e18si2144105ejb.261.2021.05.04.03.03.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:03:41 -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=fail header.i=@linaro.org header.s=google header.b="gXIogrS/"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldru0-0002oK-Dj for patch@linaro.org; Tue, 04 May 2021 06:03:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrtA-0002lC-Lk for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:48 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:42701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrt8-0003FH-ON for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:48 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 4-20020a05600c26c4b0290146e1feccd8so959378wmv.1 for ; Tue, 04 May 2021 03:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+bRC0Et+Ybmra+FhUpwC3CZYHeRVawT5fsMVpUvmvv0=; b=gXIogrS/ID+pFg7xlMlE7IaW7MgTXwwvZoWaR1tzosHa+O0+3SRKWVUas2eNYhrWB5 M+3UctNrSmbHYCfQJeKcGW9TPbcF42P21bQ+q+/avpbIb9TgtbpewXwhXRgW/hL5mzD7 bGk+OmJx9NjStVrW0fBOrP5fmR5YFo/dwETZaVkGTWiihvuv+Uo7VKzuxsenz1f5c/S2 tZowncQwm0iGE/0HiQ6xUurV3HKSDEaxlrpNbldS0HtnF/Cu2MuMkv+i5x5zclmaizAx tYHVKGQUhf9iA4xn3FZWx31YseFV1NL4BhuoFBxBiyyGbb/ygR2f0OhVW4NOl1RT1nmx deUQ== 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:mime-version:content-transfer-encoding; bh=+bRC0Et+Ybmra+FhUpwC3CZYHeRVawT5fsMVpUvmvv0=; b=eUmjpAuPzX4HP7mOrDh8w5Y3vp8RRN6Xqk2HBX6J4uSlsQKsesMT5+eq93g5z50xv3 awDQn3f2CN+LM58gdQSI16WMP0YukVAH/B8TpiPjbCaJeYjzL3zYNax+6V3SjXJC88zA KzNXoW/kg7RscNdZkCBllL5sUWXajQEDhJtMjY2ByGsf8XCpp1cXWMGTOPWu58r1R4DL sTkFy0hsRoO7fXSFNHhrf7FLH89npC/RtY0YK7g1ZDUXX6q7Wedcu6PHsMARbgg8Hgr9 EVnxvtB9sBD5NpIJAqpVpLoiOdTZ7DUoWQoiq+lCGvi5fBimlRam2ygPidO4maTkmNcq 465w== X-Gm-Message-State: AOAM533wmzSlLCkUPmlxAbSYAfXl+hfJEAHWb3eSqDQKWS/hz9NRkpKK i4twI2zx4scu3Pzb9eJmV6MX+g== X-Received: by 2002:a7b:c7d0:: with SMTP id z16mr12797982wmk.22.1620122565390; Tue, 04 May 2021 03:02:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h14sm19376284wrq.45.2021.05.04.03.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 93B841FF99; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/30] tests/docker: Added libbpf library to the docker files. Date: Tue, 4 May 2021 11:02:03 +0100 Message-Id: <20210504100223.25427-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Andrew Melnychenko , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, Thomas Huth , pbonzini@redhat.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Andrew Melnychenko The series of patches for eBPF RSS adds libbpf dependency for qemu. https://lists.gnu.org/archive/html/qemu-devel/2021-03/msg08887.html With this patch, libbpf added: Alpine - added libbpf-dev Centos 8 - added libbpf-devel Fedora - added libbpf-devel Signed-off-by: Andrew Melnychenko Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210406082947.672708-2-andrew@daynix.com> --- tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/centos8.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + 3 files changed, 3 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index d63a269aef..998a7584ed 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -19,6 +19,7 @@ ENV PACKAGES \ gnutls-dev \ gtk+3.0-dev \ libaio-dev \ + libbpf-dev \ libcap-ng-dev \ libjpeg-turbo-dev \ libnfs-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index a8c6c528b0..efc1349cc8 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -14,6 +14,7 @@ ENV PACKAGES \ git \ glib2-devel \ libaio-devel \ + libbpf-devel \ libepoxy-devel \ libfdt-devel \ libgcrypt-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 915fdc1845..483f2d9f83 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -32,6 +32,7 @@ ENV PACKAGES \ libcurl-devel \ libepoxy-devel \ libfdt-devel \ + libbpf-devel \ libiscsi-devel \ libjpeg-devel \ libpmem-devel \ From patchwork Tue May 4 10:02:04 2021 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: 430842 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3650078jao; Tue, 4 May 2021 03:14:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhvcAHjIWqY3mqu+3HT5k9OnW301UPhvFYnuOBvq1Mtym0A4qW7PGLquQLmUcsrYI/eCIS X-Received: by 2002:a0c:9d0e:: with SMTP id m14mr4569727qvf.50.1620123292199; Tue, 04 May 2021 03:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123292; cv=none; d=google.com; s=arc-20160816; b=AejdggzGVNwucO1XU8UrP8tJErGXtbFwdcgt2/x7dXfUqQgE6ZR3uPLsm9pQdwRzgJ kQNNFWU4efBJlVBMrxTkMvK6lQqseV9aSxBv/0k75usoiC7rGqIJTLHoFMnea5SvIRD+ kF2SFdf1Ekb22NwMI6UTmlOldCraunB6M0Gaxni5bv6RNlmnlvYfCK1b2gyuA4HIBsMs wg7bURHtBv9k6NANXMNQid3oyGRCEXMwB9O8g2s7ruApeuVdDSC4Ci03DoCkFXOY8Vnn 7S1nkFc8MWA+0GMDeiD3WDi5agPmz8KedhPgUhK7Kh4F11sT8Fp2oT/DUUvnbblLAXpl Y/TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=iPq9uGOdfE2STV15D/gtYtThg7p+C48gB81bHaUpG4E=; b=MIoZ7BKU+TKSPIke6QUHhlx7ffWBiL03hzuez6BVOfeBTaWIEyRbj0Oea30LXaLhCV DHobuEUsHWv6VEldVATK0wph1Q2bmLYTtLSzX/6H1Kw6aIr8cDO0rPbb6ZddaCLxfU4G P7ARhsZVxQVQCXKWVi8zHAzY9CB/v9P8PRyWeNskVzM5IMaBheXwOtYQacXEdGthZc8O d9QWInW8hFhNz8lP7dDqGY3ZrIScErh8IVoNxE0AceH3f+mfah6vzFzs2oRgNtrbxuRY njkn0NPHIkPbBC8Qb0ffjmmOVKbQ+8BS7wDoWTuhmX8SH/tRo1PH3WRL9io73Ghn/FaW armQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qrWt5IoS; 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=fail (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 d3si11832390qvn.14.2021.05.04.03.14.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:14:52 -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=fail header.i=@linaro.org header.s=google header.b=qrWt5IoS; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds4p-0000t0-H9 for patch@linaro.org; Tue, 04 May 2021 06:14:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrt6-0002gC-Pe for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:44 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:33412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrt4-0003Co-PI for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:44 -0400 Received: by mail-wr1-x42d.google.com with SMTP id n2so8744526wrm.0 for ; Tue, 04 May 2021 03:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iPq9uGOdfE2STV15D/gtYtThg7p+C48gB81bHaUpG4E=; b=qrWt5IoStrpX88zJcQ1vMdoy/l3i7izqpIYK46R1VO55zOxvNe4gnBfLO/QpOQG/Dy D6uP2tx58/vLFncE3KkY+vRkn4Pm14/WHtQLFfpN+Vi/ntYjW1+KebSfM92sb3wbfZPh wlXRaWViVZ/qcmzu8p4+qUXOU9MNTj73V9JPZfmeArXmVer8yuEpVfv+UTSUOAqNr9HJ lMYmMbqoV9Wr29AstqXfIYPx+CyPuNcSgVVYvq/lvkSPbuXWOT4kNn5M2m3LyKZvW2Q0 E05kooWllSiO0cmzmFrNpskf4i0YgYzjlFrkXIBbM5duEcfxvIr9EU1e/YVrAj3vwlBP S9Bw== 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:mime-version:content-transfer-encoding; bh=iPq9uGOdfE2STV15D/gtYtThg7p+C48gB81bHaUpG4E=; b=Zeq8I1VjQWtVtCE9n7XYSOs07CKrUIXS3JIALhj5prYHSTXJStcM3dBPSe2asGZwCf MjD4tk1/caiXgp+691rKW/kOb7nHmX7Ijan5ClMpeZGIGuYUAOf9rI7oMLYPFZiISLJX c/U6rSgWs5TfMAayLsl+fm3/FZEg/rC9uhibMiu0+XdOI9E3BQD79NO5/7uQlVOP3vSU XmG14s/+ZpH1of1WkpyeM4IwQmbmbhukjvXCa70B3+FaGCDF+y7Dfaj7PvKHrqa2+8Al XRCNtq0zDArnAbOCbwTeCwmQasN8sUD3FCCv3+/nCsGKFnO0tJSM58K3xlB6WjKfY4A1 AHuA== X-Gm-Message-State: AOAM532QVUxkvgt8r2xLSId3QAWNcqc2LmKmUAJc0zuevfoAgpe02m13 CvTSugYGAZyvGG8ix2g0Jk/LMA== X-Received: by 2002:adf:fb8a:: with SMTP id a10mr30370819wrr.21.1620122561506; Tue, 04 May 2021 03:02:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h14sm19376404wrq.45.2021.05.04.03.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AE3391FF9A; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/30] tests/tcg: Add docker_as and docker_ld cmds Date: Tue, 4 May 2021 11:02:04 +0100 Message-Id: <20210504100223.25427-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann At least for the TriCore target no easily available c compiler exists. Thus we need to rely on "as" and "ld". This allows us to run them through the docker image. We don't test the generation capabilities of docker images as they are assumed to work. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Bastian Koppelmann [AJB: fix quoting, only handle docker & clear, test -n, tweak commit msg] Signed-off-by: Alex Bennée --- v2 - only pass down AS/LD if defined --- tests/tcg/Makefile.qemu | 17 +++++++++++++++++ tests/tcg/configure.sh | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index a56564660c..84c8543878 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -22,6 +22,8 @@ quiet-@ = $(if $(V),,@) quiet-command = $(quiet-@)$(call quiet-command-run,$1,$2,$3) CROSS_CC_GUEST:= +CROSS_AS_GUEST:= +CROSS_LD_GUEST:= DOCKER_IMAGE:= -include tests/tcg/config-$(TARGET).mak @@ -42,6 +44,8 @@ cross-build-guest-tests: $(call quiet-command, \ (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ $(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" CC="$(CROSS_CC_GUEST)" \ + $(if $(CROSS_AS_GUEST),AS="$(CROSS_AS_GUEST)") \ + $(if $(CROSS_LD_GUEST),LD="$(CROSS_LD_GUEST)") \ SRC_PATH="$(SRC_PATH)" BUILD_STATIC=$(CROSS_CC_GUEST_STATIC) \ EXTRA_CFLAGS="$(CROSS_CC_GUEST_CFLAGS)"), \ "BUILD","$(TARGET) guest-tests with $(CROSS_CC_GUEST)") @@ -59,11 +63,24 @@ DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \ -i qemu/$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " +DOCKER_AS_CMD=$(if $(DOCKER_CROSS_AS_GUEST),"$(DOCKER_SCRIPT) cc \ + --cc $(DOCKER_CROSS_AS_GUEST) \ + -i qemu/$(DOCKER_IMAGE) \ + -s $(SRC_PATH) -- ") + +DOCKER_LD_CMD=$(if $(DOCKER_CROSS_LD_GUEST),"$(DOCKER_SCRIPT) cc \ + --cc $(DOCKER_CROSS_LD_GUEST) \ + -i qemu/$(DOCKER_IMAGE) \ + -s $(SRC_PATH) -- ") + + .PHONY: docker-build-guest-tests docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) $(call quiet-command, \ (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ $(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" CC=$(DOCKER_COMPILE_CMD) \ + $(if $(DOCKER_AS_CMD),AS=$(DOCKER_AS_CMD)) \ + $(if $(DOCKER_LD_CMD),LD=$(DOCKER_LD_CMD)) \ SRC_PATH="$(SRC_PATH)" BUILD_STATIC=y \ EXTRA_CFLAGS="$(CROSS_CC_GUEST_CFLAGS)"), \ "BUILD","$(TARGET) guest-tests with docker qemu/$(DOCKER_IMAGE)") diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index e6c1be5450..ed378e7840 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -75,7 +75,13 @@ fi for target in $target_list; do arch=${target%%-*} + # reset all container fields container_image= + container_hosts= + container_cross_cc= + container_cross_as= + container_cross_ld= + case $target in aarch64-*) # We don't have any bigendian build tools so we only use this for AArch64 @@ -273,7 +279,16 @@ for target in $target_list; do for host in $container_hosts; do if test "$host" = "$ARCH"; then echo "DOCKER_IMAGE=$container_image" >> $config_target_mak - echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak + echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> \ + $config_target_mak + if test -n "$container_cross_as"; then + echo "DOCKER_CROSS_AS_GUEST=$container_cross_as" >> \ + $config_target_mak + fi + if test -n "$container_cross_ld"; then + echo "DOCKER_CROSS_LD_GUEST=$container_cross_ld" >> \ + $config_target_mak + fi fi done fi From patchwork Tue May 4 10:02:05 2021 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: 430863 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3656063jao; Tue, 4 May 2021 03:24:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6xa0I75nGr++zUSgnNteXMnY1yKCUWZ8aGj97rzC7PjIZFD0QnpgNTcjjPZX4oA4VJ/J+ X-Received: by 2002:a37:e10d:: with SMTP id c13mr24197069qkm.322.1620123869223; Tue, 04 May 2021 03:24:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123869; cv=none; d=google.com; s=arc-20160816; b=vBjnDMUC338Vi4Dqu8PF9zojXHuAYL7crqyInk8RuZWadsQRyHg3vsOkaKBBJbI7Lo Pm+V0k1pLKGdKp6fCoqK/kgFaQ2pOhhcwJLZgjVO2Tuk68Ih0/0mlCq/ELCjI5w7DDn6 6sqIkDi2mzJRkiFaCzJdXfR6lnbEZsU3k+pmvz32O7z5Nxg0BYsBlxFedeEEk9DLs+dP liNr2bKPuU8a8NStg3jZUfbPpm/C6yu085jhXF2pfVpxC0kH3hg/PhZB1bTcsE+KnABh XhYAHf1eSNc4ekRtvK2FT8UOgVzkpeMamv5GDYVviQf0FFMUL4BYWyOnlbjoEW6gES/D hPGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=VsOEBZtB0HF2JImaMnITvaw+tRLQeXiNM3E9i7SwoP8=; b=l7VId3VyRNpc7ODi5FoXC2qjQMm/X2qq7duoRDkYtfepVYkpPUVKMEgy+mmX0Auqnt gYIFmQrUsxOUclz9Mb48vL+k3HA+3LO9JwadLkKe5Y+TmzcswF6s/e6ouKFjsPyfZj6O yc26lAa2vGAKBJnteiXPMbjV66BgLf58MBkQzaYK8rQy+Jkg58f8RPv5+NXuPC0W4Hec QVuLrkUo5Q7gIz6CcMMSXRVM9NO6s6UGeOB2bsXi2rfKJ9FlAGSsGEXbCtgn8TwKIw6S z/QNkcPw8agy/5mSARZ6IF5SdHz7CRWJanc7r/gWXuTG4MQh6XrN79d6gBCxXUoJ1ZuS hw7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HCT2ZZIj; 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=fail (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 g4si12250826qvi.219.2021.05.04.03.24.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:24:29 -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=fail header.i=@linaro.org header.s=google header.b=HCT2ZZIj; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsE8-0003JZ-LB for patch@linaro.org; Tue, 04 May 2021 06:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzw-0002eU-NY for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:48 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:56106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzq-0006p6-AF for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:48 -0400 Received: by mail-wm1-x32f.google.com with SMTP id i128so3027537wma.5 for ; Tue, 04 May 2021 03:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VsOEBZtB0HF2JImaMnITvaw+tRLQeXiNM3E9i7SwoP8=; b=HCT2ZZIjEzwPiuoRYouhafiSUVh8poxDZpaSYLY1d+sBdEDGdHnO+jlsLczns1UjZz nugmWKtjjqeV50wxCR7ck4L3Fyam/3Di7z8jvm9yItBqrPWCI2HcOZ7HaNrxWPe0VoYw sUCOVs02fTJmqzeNr1l97bSPfQPr2HgwC3T2phEZuJ4NBULbHXIuwWf865igmOkUSkaE s8dgsoWZahReRTY5lwK0zLwr3Ngg17/ziW//1Bo3exLHIdg50nz0S++X3lJBBq2YWPU6 4UbByNAk8DoSm/32ph9jrqpGKxvZUlDPqSgRuHjiaYuGHF89ENXKOwL0eomNaLRX8xly yO3w== 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:mime-version:content-transfer-encoding; bh=VsOEBZtB0HF2JImaMnITvaw+tRLQeXiNM3E9i7SwoP8=; b=pbiImj2x+Mst29RIAHrju40/AgIjbg8cHjjmAyxOKWc8Ksh29kFHIGsukuv4EEBjhv 8qXCyDU1DkTc4RczxtY/l6CpaDkr9GKuErctnHzFEoWZrx/CMgE9qCh00cTh6uBmzVfF 5Ch29UXNwtzYJ1A6ex0ADtAr46LF/D9oVfk2e6oveeYpJDE5pB1xO/ZzetzEeryK9V3k G6XhjAgutlkaL59IRqOTClwN6t19O441FLeSQgOXq/BJKOKIBtG8hsH2K5yIhFsU57oP iQG1QDQzTRk54pTwHzxVfc9642oqdzcbcULM3GHy+ABI18C81cRwRdATXrA/B0NFoU5f xTsQ== X-Gm-Message-State: AOAM531e2b5p8rFb+ZMUNI6f6lyhPaFELi8NYxxhuXjv97Hy3b3aoMV/ L/QT6fUgrzPGs0IRWnuqH8+TUg== X-Received: by 2002:a7b:ca42:: with SMTP id m2mr26263966wml.67.1620122980972; Tue, 04 May 2021 03:09:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o15sm5851734wru.42.2021.05.04.03.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C50431FF9B; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/30] tests/tcg: Run timeout cmds using --foreground Date: Tue, 4 May 2021 11:02:05 +0100 Message-Id: <20210504100223.25427-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann when trying to run successful short tests from the Makefile timeout would not terminate. Rather it would wait until the time runs out. Excerpt from the manpage: --foreground when not running timeout directly from a shell prompt, allow COMMAND to read from the TTY and get TTY signals; in this mode, chil‐ dren of COMMAND will not be timed out Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-3-kbastian@mail.uni-paderborn.de> --- tests/tcg/Makefile.target | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index cab8c6b3a2..b29fae4630 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -43,9 +43,10 @@ quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) # $1 = test name, $2 = cmd, $3 = desc ifdef CONFIG_USER_ONLY -run-test = $(call quiet-command, timeout $(TIMEOUT) $2 > $1.out,"TEST",$3) +run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \ + "TEST",$3) else -run-test = $(call quiet-command, timeout $(TIMEOUT) $2,"TEST",$3) +run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2,"TEST",$3) endif # $1 = test name, $2 = reference From patchwork Tue May 4 10:02:06 2021 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: 430832 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3643646jao; Tue, 4 May 2021 03:06:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqn/pGTViW+SSe23RqV7OYoEQAItwmGHKIbrDOHQfvurf4CO17xrkJ2f9aAglZPZv7KxOe X-Received: by 2002:a67:f988:: with SMTP id b8mr20588958vsq.14.1620122778394; Tue, 04 May 2021 03:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122778; cv=none; d=google.com; s=arc-20160816; b=tJ4Hmv1qGs6CPUdptnMLuKmJrPR0l4IfT6XZwyAJtAb7l+eNy9BOBccm9YT+DfLt1c +KNDWKIIqJHDBVvBsSpZ++QlINiAvMWjT0JytJ2LL4BnzgtKjR/MV0h2+T3uqado/Bi9 XKiDB7wvcphSd3SGlk6/hhLHcK1hH3ATKeheKyfmkWBlLHd6IIn6ubDoTZbvoK06rJoT NAc1xI1xAbY9D7UHPTqgWCcP+D8+Wnt15iMQ9b8iDbwo3ZjsKueTORfuF6Bgl3cVgIs7 SsT/YgzGByzOhBVNdTJpbMqXiuyEMRN9wVecNXrj+V3R3x6Mit3XQ+0mMMYmxVr4gJaG 60bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=7rjRZMpfOjz06kT3DXo4AnrGU+LQX663aqbqm3FCMKI=; b=bxX4dn03okGu3voyEdD+iaYxdzd5U48jFFEs+uwqpDUq3Om713bEdd3Y+wzmUjDY00 +n/SLEMzk3D8nBFk0sq4Lrg3dZVFgebRAXSfIsPO1rL7HlM0ulabW895jU4tM1svRqQb 4tE8Ww1NQOSlDDoXkcMJciKmGTriKArRUWUjfWwjYLZMXZ+2Wa7sT67n3giuBiPPk+Bz 41wgH6WJCQPaVQ1+RITRq/Ns8cRWcluG4H89mCYZreOTmkOC0H96ATADTX63ph1lG3FO P6O9xRs2FqPn/HhSEf5sfk9GppKyg738fxhWxISUVlw29zF3T2/WDQKviDaPUkcyiL9Z Xguw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i8kpCZNh; 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=fail (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 e22si6633698vsl.285.2021.05.04.03.06.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:06:18 -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=fail header.i=@linaro.org header.s=google header.b=i8kpCZNh; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldrwX-0006NI-MS for patch@linaro.org; Tue, 04 May 2021 06:06:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrtB-0002lq-32 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:49 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrt7-0003Ea-N1 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:48 -0400 Received: by mail-wm1-x332.google.com with SMTP id p6-20020a05600c3586b029014131bbe5c7so887816wmq.3 for ; Tue, 04 May 2021 03:02:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7rjRZMpfOjz06kT3DXo4AnrGU+LQX663aqbqm3FCMKI=; b=i8kpCZNh5jyW+cU//gwllI25YVBCQo1ToHsB8ptYIciZaMFJ9/zn4A+/9j+E5bsZ+P TpDyVLRgg9OhsFjEWR2QanLPcmLG816aCFuqyGFwXMmKRPWxE8zo5+/6h0X+8UXwqPDB bow5e+wqC6DSA5fJNv2ncJ2C/YgCWiK46s4q7ZuyOnUHfD79btmYFji28d7FaTGlDLqN 6Oz58p5rtr409jgiPDRHGUp4Zx/iT2RvZPEZ3H4EK3Ve3SIWR7E+mIeANevRBjzE/+fh aGiv7efyybU6mkiBQ1Au4oqwz4QXLmue7n6NBV0zmLyvkfMBd/ye68r682Bc0rXhbLQC J1pA== 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:mime-version:content-transfer-encoding; bh=7rjRZMpfOjz06kT3DXo4AnrGU+LQX663aqbqm3FCMKI=; b=IXiK1V5sGwnIHqGaK91RatvO2LLXjj8x5yMlIjD22vMsorufcQ7JEsS8P8lq+NtzgR cjv6hA2Z1oBfyzVSqz5uP8Wz3fC40nam5tLK0V88MVfPRYPahBMFxggd2tfG45vNi4U5 K0Idk3R7frr5pGuku1KjowcTRPGgcYrUXv6mv1MgZgdtKzPgGHkYw8vbsnQxWveGcLgv 8PpULLTLU+Woe7qlOeW7Ey+59YTrL2W1oLTwspHBVHl7xBrWiJudJVxNVl8HPwPR06pj 0Dll7L8tG6fuaMrS16IaRnvw62t19sHknNl8/CRRb8fo2sTcpIYfYK4Dx+BmxupCO3PG nHvQ== X-Gm-Message-State: AOAM532kdcemokkAWBpQ8oLNxVcGnan8ZfEkEuV/lAmwg4328L3jTmr0 xfzB31Yoi80z/O9ZuRS7ZLOTWQ== X-Received: by 2002:a1c:7e45:: with SMTP id z66mr25917639wmc.126.1620122564276; Tue, 04 May 2021 03:02:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g6sm18524588wrr.63.2021.05.04.03.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E1CD21FF9C; Tue, 4 May 2021 11:02:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 13/30] hw/tricore: Add testdevice for tests in tests/tcg/ Date: Tue, 4 May 2021 11:02:06 +0100 Message-Id: <20210504100223.25427-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann this device is used to verify the correctness of regression tests by allowing guests to write their exit status to this device. This is then used by qemu to exit using the written status. Reviewed-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-4-kbastian@mail.uni-paderborn.de> --- include/hw/tricore/tricore_testdevice.h | 38 ++++++++++++ hw/tricore/tricore_testboard.c | 8 +++ hw/tricore/tricore_testdevice.c | 82 +++++++++++++++++++++++++ hw/tricore/meson.build | 1 + 4 files changed, 129 insertions(+) create mode 100644 include/hw/tricore/tricore_testdevice.h create mode 100644 hw/tricore/tricore_testdevice.c -- 2.20.1 diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h new file mode 100644 index 0000000000..2c56c51bcb --- /dev/null +++ b/include/hw/tricore/tricore_testdevice.h @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2018-2021 Bastian Koppelmann Paderborn University + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + + +#ifndef HW_TRICORE_TESTDEV_H +#define HW_TRICORE_TESTDEV_H + +#include "hw/sysbus.h" +#include "hw/hw.h" + +#define TYPE_TRICORE_TESTDEVICE "tricore_testdevice" +#define TRICORE_TESTDEVICE(obj) \ + OBJECT_CHECK(TriCoreTestDeviceState, (obj), TYPE_TRICORE_TESTDEVICE) + +typedef struct { + /* */ + SysBusDevice parent_obj; + + /* */ + MemoryRegion iomem; + +} TriCoreTestDeviceState; + +#endif diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 12ea1490fd..9791986a3e 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -28,6 +28,7 @@ #include "exec/address-spaces.h" #include "elf.h" #include "hw/tricore/tricore.h" +#include "hw/tricore/tricore_testdevice.h" #include "qemu/error-report.h" @@ -57,6 +58,7 @@ static void tricore_testboard_init(MachineState *machine, int board_id) { TriCoreCPU *cpu; CPUTriCoreState *env; + TriCoreTestDeviceState *test_dev; MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ext_cram = g_new(MemoryRegion, 1); @@ -88,6 +90,12 @@ static void tricore_testboard_init(MachineState *machine, int board_id) memory_region_add_subregion(sysmem, 0xf0050000, pcp_data); memory_region_add_subregion(sysmem, 0xf0060000, pcp_text); + test_dev = g_new(TriCoreTestDeviceState, 1); + object_initialize(test_dev, sizeof(TriCoreTestDeviceState), + TYPE_TRICORE_TESTDEVICE); + memory_region_add_subregion(sysmem, 0xf0000000, &test_dev->iomem); + + tricoretb_binfo.ram_size = machine->ram_size; tricoretb_binfo.kernel_filename = machine->kernel_filename; diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevice.c new file mode 100644 index 0000000000..a1563aa568 --- /dev/null +++ b/hw/tricore/tricore_testdevice.c @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2018-2021 Bastian Koppelmann Paderborn University + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/qdev-properties.h" +#include "hw/tricore/tricore_testdevice.h" + +static void tricore_testdevice_write(void *opaque, hwaddr offset, + uint64_t value, unsigned size) +{ + exit(value); +} + +static uint64_t tricore_testdevice_read(void *opaque, hwaddr offset, + unsigned size) +{ + return 0xdeadbeef; +} + +static void tricore_testdevice_reset(DeviceState *dev) +{ +} + +static const MemoryRegionOps tricore_testdevice_ops = { + .read = tricore_testdevice_read, + .write = tricore_testdevice_write, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static void tricore_testdevice_init(Object *obj) +{ + TriCoreTestDeviceState *s = TRICORE_TESTDEVICE(obj); + /* map memory */ + memory_region_init_io(&s->iomem, OBJECT(s), &tricore_testdevice_ops, s, + "tricore_testdevice", 0x4); +} + +static Property tricore_testdevice_properties[] = { + DEFINE_PROP_END_OF_LIST() +}; + +static void tricore_testdevice_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + device_class_set_props(dc, tricore_testdevice_properties); + dc->reset = tricore_testdevice_reset; +} + +static const TypeInfo tricore_testdevice_info = { + .name = TYPE_TRICORE_TESTDEVICE, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(TriCoreTestDeviceState), + .instance_init = tricore_testdevice_init, + .class_init = tricore_testdevice_class_init, +}; + +static void tricore_testdevice_register_types(void) +{ + type_register_static(&tricore_testdevice_info); +} + +type_init(tricore_testdevice_register_types) diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build index 77ff6fd137..47e36bb077 100644 --- a/hw/tricore/meson.build +++ b/hw/tricore/meson.build @@ -1,5 +1,6 @@ tricore_ss = ss.source_set() tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c')) +tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testdevice.c')) tricore_ss.add(when: 'CONFIG_TRIBOARD', if_true: files('triboard.c')) tricore_ss.add(when: 'CONFIG_TC27X_SOC', if_true: files('tc27x_soc.c')) From patchwork Tue May 4 10:02:07 2021 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: 430835 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3645936jao; Tue, 4 May 2021 03:09:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeJMnhivGDUR3RNijmCJCtrcuZX8GOy783difQTQxiR9oB3Cy24b+vnGMvuNt+oKFLhB9E X-Received: by 2002:a05:6102:a89:: with SMTP id n9mr20697777vsg.45.1620122955420; Tue, 04 May 2021 03:09:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620122955; cv=none; d=google.com; s=arc-20160816; b=FdAerEbPVQkCzkFzsfCzxJez9/lKsnxBDgTIZaW0EiHjSVRzLi8Ur1OVc9SVjwna46 QWAQ1YC/iPxoKW1CYhFFB8GqmwKJdx1tDkQj6ZAx+zoJg73vU/vwnAE5fC+2Q7duZ6Yh KTcWVW2xueJ+JYFn2PdpBGi/OONy3n59eHb1LPQtl14DxcDl9Tof8VhDWZbFj6SZc37t v55Hrs48+Kj/ST6TUSyhoAfQjhXdtPJanrI7AVNYYuoLMLv7MaWYGCKmac9/FUJwhLYX tdQ08fZsg09NpoZZP8XL3TvwiSfQpNVvBuHIQgzPV5+2x3L1umFvvEIJ8nK5XHGVeqsp F0CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=NVoblo6bOlZq118cknJIt8N7dip9vFj2ILUd1WjhqJA=; b=c+j6La+olgl3ZLfFT8OiY7hUyekeqevYmO0ry9o7w3pqKVqrABKsBpVKMmlkmdU6uM WhQS7K+S/OmgLUj6b0uDyA2AQWubpnPm7PzUvyj8GhJ7J21egt2aICtTYazNi8FElyxe 3LZ4HdhhDEnSiFVuZrLFo8+StDHrqYGxLDH85/CcDJ2YqX0jvdY2SpDVooyK04Q+3wir ic/VorGR8FZP/oqajvtvTBlW8/jh/zXJBF9v+WMjBpl0N9aJ3AdwvDwhzjj2QNbsfG32 Ag2T8C2vIOoBqx656Uw1amJ3IeLWsqpO+UiQBnPMFdHDCbhqP/0QT/z5cDyq/oI9t2nI 81Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NTNNnRvx; 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=fail (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 e28si7220711vsj.181.2021.05.04.03.09.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:09:15 -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=fail header.i=@linaro.org header.s=google header.b=NTNNnRvx; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldrzO-0001cM-Pg for patch@linaro.org; Tue, 04 May 2021 06:09:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrtC-0002oB-Kz for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:50 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:44929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrtA-0003Hm-S5 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:50 -0400 Received: by mail-wr1-x430.google.com with SMTP id l13so7097620wru.11 for ; Tue, 04 May 2021 03:02:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NVoblo6bOlZq118cknJIt8N7dip9vFj2ILUd1WjhqJA=; b=NTNNnRvxSmMcvk9M7B/yScV3PsisQ47TuyVKYUAtTmcLrxoAP4+ueVKTQGIVIZKEjV kBNsVAqd0fjhvlnZcZ9KYylBoW2HJPxcw0khQCzKAXXBFzpmcM2a1EhfzydIKZTvrwXI pFCjLj1wJX8NSdYrQfGkPGUjU33zER8eNcwm475J25jk7N7z8Tn2ZPHgyy52TsV2AeM3 vHz234ShDku4UYWk0zqYbVfANmH2nhoW0VoPMh59e/NcZ30ia0q0UfyEMOTIB9qeDZ0S MEVApWqp0vgBJzwUNak0x/LTYn9d2YaVuPIIb3DEZT6V4VBWX+JhJYNah26lzdK4Yr30 OKLg== 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:mime-version:content-transfer-encoding; bh=NVoblo6bOlZq118cknJIt8N7dip9vFj2ILUd1WjhqJA=; b=EPdoWAfOhOt0WdQE6ixuhYXYYAXCA3fIwcv/6Lmi9u0J1idA80tODEwHsnqsKPSdgY 9uJLTn/5V2bdvXMz1mrJsEN71qOgOVmGmdy5q5AcIQlQbTMabqZ4mq48cBSaB2FOXXPv c1ZcMOLK6gApmE8ZucQEdAs2NL1sdSz9r/h6e2I5JDjnCNmnHCprO/g0Y5yNTbzN52sY 0US3gJJZNXG4l17ZDi7rGzXqp2hBWNz3F6qvrIf/7PWc2o0iYtOGKNevhrOyxNS+Iqwh UKLyRmgtuzKlx3nCPiKBWcCHz8eyZ7nqVPZf6wLWBDcSlAei5pB+bJ4QEIXYGPfxl1OH diIQ== X-Gm-Message-State: AOAM530Z0TKUBvewtTm9cG+tdTNl0ZpWnGNLhVfs1mbJEWc+Qu7wL57Y UNo2u5rHYc144SgASvmc5GaVJtXVZtxKiA== X-Received: by 2002:a5d:4c8a:: with SMTP id z10mr31142265wrs.395.1620122567336; Tue, 04 May 2021 03:02:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p10sm15055132wrr.58.2021.05.04.03.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C4A81FF9D; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/30] tests/tcg/tricore: Add build infrastructure Date: Tue, 4 May 2021 11:02:07 +0100 Message-Id: <20210504100223.25427-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann this includes the Makefile and linker script to build all the tests. Reviewed-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-5-kbastian@mail.uni-paderborn.de> --- MAINTAINERS | 1 + tests/tcg/tricore/Makefile.softmmu-target | 15 ++++++ tests/tcg/tricore/link.ld | 60 +++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 tests/tcg/tricore/Makefile.softmmu-target create mode 100644 tests/tcg/tricore/link.ld -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index fc0b429b45..4d3727cad5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -378,6 +378,7 @@ S: Maintained F: target/tricore/ F: hw/tricore/ F: include/hw/tricore/ +F: tests/tcg/tricore/ Multiarch Linux User Tests M: Alex Bennée diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target new file mode 100644 index 0000000000..d64a99b95f --- /dev/null +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -0,0 +1,15 @@ +TESTS_PATH = $(SRC_PATH)/tests/tcg/tricore + +LDFLAGS = -T$(TESTS_PATH)/link.ld +ASFLAGS = + +QEMU_OPTS += -M tricore_testboard -nographic -kernel + +%.pS: $(TESTS_PATH)/%.S + $(HOST_CC) -E -o $@ $< + +%.o: %.pS + $(AS) $(ASFLAGS) -o $@ $< + +%.tst: %.o + $(LD) $(LDFLAGS) $< -o $@ diff --git a/tests/tcg/tricore/link.ld b/tests/tcg/tricore/link.ld new file mode 100644 index 0000000000..364bcdc00a --- /dev/null +++ b/tests/tcg/tricore/link.ld @@ -0,0 +1,60 @@ +/* Default linker script, for normal executables */ +OUTPUT_FORMAT("elf32-tricore") +OUTPUT_ARCH(tricore) +ENTRY(_start) + +/* the internal ram description */ +MEMORY +{ + text_ram (rx!p): org = 0x80000000, len = 15K + data_ram (w!xp): org = 0xd0000000, len = 130K +} +/* + * Define the sizes of the user and system stacks. + */ +__USTACK_SIZE = DEFINED (__USTACK_SIZE) ? __USTACK_SIZE : 1K ; +/* + * Define the start address and the size of the context save area. + */ +__CSA_BEGIN = 0xd0000000 ; +__CSA_SIZE = 8k ; +__CSA_END = __CSA_BEGIN + __CSA_SIZE ; + +SECTIONS +{ + .text : + { + *(.text) + . = ALIGN(8); + } > text_ram + + .rodata : + { + *(.rodata) + *(.rodata1) + } > data_ram + + .data : + { + . = ALIGN(8) ; + *(.data) + *(.data.*) + . = ALIGN(8) ; + __USTACK = . + __USTACK_SIZE -768; + + } > data_ram + /* + * Allocate space for BSS sections. + */ + .bss : + { + BSS_BASE = . ; + *(.bss) + *(COMMON) + . = ALIGN(8) ; + } > data_ram + /* Make sure CSA, stack and heap addresses are properly aligned. */ + _. = ASSERT ((__CSA_BEGIN & 0x3f) == 0 , "illegal CSA start address") ; + _. = ASSERT ((__CSA_SIZE & 0x3f) == 0 , "illegal CSA size") ; + +} From patchwork Tue May 4 10:02:08 2021 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: 430864 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3657376jao; Tue, 4 May 2021 03:26:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjgpEkhXFBGnqGRCRDd73/3Vc7x3lPex894k8rWQq1ReIbj1/41hfAI1eNpCe8X1tRrkIv X-Received: by 2002:a05:620a:15da:: with SMTP id o26mr6900342qkm.412.1620123991498; Tue, 04 May 2021 03:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123991; cv=none; d=google.com; s=arc-20160816; b=Mm9dU4ZmXR2vbyeUhK3UmZqEiIH9PDLv1D2Kv+LjMhXVyiTkyN3u49YgpjjqRM0515 m9Zfx7XN/0vNx0zHZSmSQ9/7A+s3fg36m7hBkzMpk6ASrlIpHfLyMLtB9/6ZSbrkekWO XAyZwjMVQ1Ss5Hu9KsbVK8oc/guBIcWOhulO2WNiue6WrBwukJZRd2n8uhRVQ9h74eth ee0/imcWercOkC4qtPfK1ZJoeof+80S/VXFCznOxrmnzITrg7mmiK+zmzZrAWckJw4Uv Ssa1tUxP5jmlltf5/EF2GjE7DpXlREZYGIq8bKDXvgmwka/UiZ9/iTYmjr47doWL2WVj gDJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=AJ9m89LqMP6JqoZX9kb8/L/8kKBGmEH5iou5hRLkrKc=; b=UfE0CQo11f6lxaiTHvtC0A8nYGrJWkqXhp9vto0ECvNCKM3/DQV9h1d8AAzhV6YBVR 9+Mqe1W6gB4oegvxQwLPRlvDtJL9qjFCMZDixZ/kmph59fdRsUE1Q9AD4BmGVDmybfRS AyVBvmAKVM+aJu0EzAM1NqSEuGDndp9LOZcI6KjSqxf9dD//IhoJULyjci0HuM4ZbS8O TXboM6vJqMshj1Ua4wbsHQ/dj/7n4s9yIvPNDG7nqy2bMMRAx6yJPy9aOUvqvLUdtJ4o zajya9FZopv2LDqDVGCi/EMhhTqtii54rV8U5GKY4ihb+qDL4qdhLlGe+eAbLGSI7Oqc 6/wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qjuQJh8l; 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=fail (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 s15si2140611qtw.345.2021.05.04.03.26.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:26:31 -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=fail header.i=@linaro.org header.s=google header.b=qjuQJh8l; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsG6-0005Gq-So for patch@linaro.org; Tue, 04 May 2021 06:26:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lds9I-00068X-QX for qemu-devel@nongnu.org; Tue, 04 May 2021 06:19:28 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:35491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lds9G-0003ke-W5 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:19:28 -0400 Received: by mail-wr1-x42b.google.com with SMTP id a4so8784031wrr.2 for ; Tue, 04 May 2021 03:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AJ9m89LqMP6JqoZX9kb8/L/8kKBGmEH5iou5hRLkrKc=; b=qjuQJh8lZ+yR8D1Jq4peJ8hr1n8n9769/TJ6at35IQXD/HEO2ZlfsyrCcDdOwoS6GI qWtp7utMkIx4b99jistfeCFfPntweU+4NqhIAVaI1eduhBhMMmm3qpzmQ66wiegwZeU5 lt6Uk8Ltz8eRZODD/MRbB1G/Popim58266WVFedQgAelTPMMTh4gHZaHZHfGNLzCmawZ zPEEaoSPSoswVBAuAqsRpLcFfwQ24maQilUvHVg+zbxxTiPrVym1LB1dR2T0ZzNBA3z5 nWi8BOkh/4MJlwaa7jJZ0Nwc+wWiaJkSsde+9LrqyKa8vVxHx18H84xjPps+OTbDwC5m fI+Q== 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:mime-version:content-transfer-encoding; bh=AJ9m89LqMP6JqoZX9kb8/L/8kKBGmEH5iou5hRLkrKc=; b=mZxroPML02EW2xM9XScXlFzYAut+IDg1M1GOHZv58OO8Taj3B51eKF1q8Q0S+DRdl+ gLL59mwbTbkPMSeLdGvYQZqxjl839le5jDofpM33MorlprlJyo91OQf5sAXmzZupP7cs l2nxCOdAIEzoD65Gdj6c5+Tlyx2jC2zMF7ghjGInzmDdNJo1u5Lf37qgQUHNFBrxKbeM Yt4HGDI6dDbKJUEU6+QV9tpBXJrIY0/IAZ8OklRSb/1EkL2gZSQ7Sd2cioQWq/OzX6vS VLHqGXux2jpGBOHmPRaCkkpGCCssXFG1t+jIQIK5ORo5eNm8I+mVBXD5g1Yx7Xx8cuj7 LvLQ== X-Gm-Message-State: AOAM532WTnV0S1rSisdMaEQ/PQnJuIepBvAj526MWRD4lZLpzkJPECqJ k1SPNoLm4S/00SFLVg8UFv9J+w== X-Received: by 2002:a5d:6749:: with SMTP id l9mr31047001wrw.142.1620123565616; Tue, 04 May 2021 03:19:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q16sm2199631wmj.24.2021.05.04.03.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:19:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 247501FF9E; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/30] configure: Emit HOST_CC to config-host.mak Date: Tue, 4 May 2021 11:02:08 +0100 Message-Id: <20210504100223.25427-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann this is needed by the tricore-tcg-tests as tricore-gcc is not easily available. Thus we rely on the HOST_CC to do the preprocessing of the tricore assembly files. Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-6-kbastian@mail.uni-paderborn.de> --- configure | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/configure b/configure index 4f374b4889..bb86c72479 100755 --- a/configure +++ b/configure @@ -6139,6 +6139,7 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak echo "CC=$cc" >> $config_host_mak +echo "HOST_CC=$host_cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "CONFIG_IASL=$iasl" >> $config_host_mak fi From patchwork Tue May 4 10:02:09 2021 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: 430839 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3647960jao; Tue, 4 May 2021 03:12:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPMkLkr2kjOb8zpFpSLM7viUnD+MUDMPVrByhBtN5X9s0TjSCWRvQCtDaN2wZAw1k1ylXj X-Received: by 2002:a1f:99cc:: with SMTP id b195mr19314859vke.19.1620123128373; Tue, 04 May 2021 03:12:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123128; cv=none; d=google.com; s=arc-20160816; b=SAyYqcYnXpPBc41DXwHNLpArrEG1YJOj09pE299wxUHDEvg80vDQzKjVB8CxFDqY87 UsWTKb51JkBQtpTiF1rMQFrQ3saWFc7RdtsLz+NsjTqvKmbeldWFo2wstqgipVb+dXTN PlPxe90i31C1tB/mic6KGrl5LllZWS6z4U32lZxmWHUyhzLVMjNgMwNNT8cQvcU/6qE/ Qb/BhIuUqOQtXnBFnvjj0ZRppfRORn8Osd6U+GWfbKzSPwbIDUUtVLwN/K/Nf3QJtiTR Qhxi/Fp8eyR4c2UXGvBD4C/M6REhxK4qtNIO12fmuBbmWdnpQALatKaBfXz7d3VFPILX rx1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=UDzjlNZz/GlC70CH5HhSB4c445lM3jEK8WC7UgJUryw=; b=PGhR8X91SZLHDwWXpVZmtma9WfoENe4SbL89fFtAOEv0i91Nihtd988E9mAh42W8Co bEqy66m/qDjoHuIVIEkWTfMBkCaz6cbayVspoL97rTI+2VJ5/v9L1NyV0mBIRhiBcOa9 IjysTDhcSvHWZlAMVESXL8vsWOjZ0K6lYjCGr3Eet3Zd5dwsy4EAUJe3BR5MEXBAUkdK U5poTDDr6mKt+/Cxa9HxM6scM5K2wgjXtMv+BsfD+N9d6zQFTbmCkNV1wmUhDrEA/CZo lwmGq/9uQ2fpYDdOpsFLsm4IzD+aNBN58GzFy7+eKodz8QYnBttdnegDPgEUOUK1ljt7 UbdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ubxfGTD/"; 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=fail (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 y7si1854681uai.152.2021.05.04.03.12.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:12:08 -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=fail header.i=@linaro.org header.s=google header.b="ubxfGTD/"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds2B-0005ho-Nh for patch@linaro.org; Tue, 04 May 2021 06:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrze-0002RZ-NU for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:31 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrza-0006iv-Tl for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:30 -0400 Received: by mail-wr1-x42b.google.com with SMTP id l2so8726302wrm.9 for ; Tue, 04 May 2021 03:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UDzjlNZz/GlC70CH5HhSB4c445lM3jEK8WC7UgJUryw=; b=ubxfGTD/vK0TaiENyKZAbHDbxUMfzuWYXM78xIyWz8RoaWQ7WTeJk3jr8U0n5WevMG 8+ckljRNgLuY6HMmOjN3kZeNs5YARnsoMoh1/LKO48snUqGQJ4rXTRUSkY5O8fkW0MQa CnPsQqEytooFr4mTuDnOJtHhkQFJTL8PGRqat1KvKASOHRR7qXxKXHcnU2nwAsbv6ycf +XCIAUzCGOWJv40sMKKPoR/x4fuEnCxpYKzXa2VR7iVbTf+J/ZMnzU6e7fgq39a6Z1bP EfjBsbaOKVulApAjjAysxtCfHsTzuwyF9O2kq+cwcz5AWbtrvPNwSsMPXo6px+0Dps+K l8nQ== 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:mime-version:content-transfer-encoding; bh=UDzjlNZz/GlC70CH5HhSB4c445lM3jEK8WC7UgJUryw=; b=nlfJpBsZChetb4hxvMP+ASIDIycql/Xy106zV68PnU2S3S55z6vLST00lXH0Nj4KkT cJlHGmK7B9jM2mM95MXnGqiBUMz/xe5BmUMEyAKBrlI4P1LLY1DeRGqtZH0WHGlSrBTt COLLyFd5KRfuHOET60RA5IgYNFqJPxCkwdSTvZ8Yzx/9jA7p5QhXs7b94d5UBBTvTu1y XUEf2kXt9XglmF8JZfPetjgGQBrGABbz7D4GMqOqAUHihcRACtIqzuys3U0H3wwsnfeZ 9RG5r2PftIx7o+LuEPJy7OeuzjVfVZAuvm/op29RWZM5wMIpjQpDdw73SyBZUAvqAwQ2 6mjw== X-Gm-Message-State: AOAM533EYkeSwcYuwbZNHSumyxr6DblxC5vGa5kaXCVC+4rjx2eBocxX MwvE6sJ7pCG2VWUhnjIM3hs1PFnbcqVUTQ== X-Received: by 2002:adf:f38c:: with SMTP id m12mr25117367wro.282.1620122965158; Tue, 04 May 2021 03:09:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q19sm1916301wmc.44.2021.05.04.03.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4049C1FF9F; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 16/30] tests/tcg/tricore: Add macros to create tests and first test 'abs' Date: Tue, 4 May 2021 11:02:09 +0100 Message-Id: <20210504100223.25427-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann This kind of tests is inspired by the riscv-tests repository. This adds macros that makes it easy to create single instruction self containing tests. It is achieved by macros that create a test sequence for an instruction and check for a supplied correct value. If the value is correct the next instruction is tested. Otherwise we jump to fail handler that writes is test number as a status code back to qemu that then exits on that status code. If all tests pass we write back 0 as a status code and exit. Reviewed-by: Alex Bennée Signed-off-by: Bastian Koppelmann Message-Id: <20210305170045.869437-7-kbastian@mail.uni-paderborn.de> [AJB: add container_hosts] Signed-off-by: Alex Bennée --- tests/tcg/tricore/macros.h | 53 +++++++++++++++++++++++ tests/tcg/configure.sh | 6 +++ tests/tcg/tricore/Makefile.softmmu-target | 2 + tests/tcg/tricore/test_abs.S | 7 +++ 4 files changed, 68 insertions(+) create mode 100644 tests/tcg/tricore/macros.h create mode 100644 tests/tcg/tricore/test_abs.S -- 2.20.1 diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h new file mode 100644 index 0000000000..76c133132a --- /dev/null +++ b/tests/tcg/tricore/macros.h @@ -0,0 +1,53 @@ +/* Helpers */ +#define LI(reg, val) \ + mov.u reg, lo:val; \ + movh DREG_TEMP_LI, up:val; \ + or reg, reg, DREG_TEMP_LI; \ + +/* Address definitions */ +#define TESTDEV_ADDR 0xf0000000 +/* Register definitions */ +#define DREG_RS1 %d0 +#define DREG_CALC_RESULT %d1 +#define DREG_TEMP_LI %d10 +#define DREG_TEMP %d11 +#define DREG_TEST_NUM %d14 +#define DREG_CORRECT_RESULT %d15 + +#define DREG_DEV_ADDR %a15 + +/* Test case wrappers */ +#define TEST_CASE(num, testreg, correct, code...) \ +test_ ## num: \ + code; \ + LI(DREG_CORRECT_RESULT, correct) \ + mov DREG_TEST_NUM, num; \ + jne testreg, DREG_CORRECT_RESULT, fail \ + +/* Actual test case type + * e.g inst %dX, %dY -> TEST_D_D + * inst %dX, %dY, %dZ -> TEST_D_DD + * inst %eX, %dY, %dZ -> TEST_E_DD + */ +#define TEST_D_D(insn, num, result, rs1) \ + TEST_CASE(num, DREG_CALC_RESULT, result, \ + LI(DREG_RS1, rs1); \ + insn DREG_CALC_RESULT, DREG_RS1; \ + ) + +/* Pass/Fail handling part */ +#define TEST_PASSFAIL \ + j pass; \ +fail: \ + LI(DREG_TEMP, TESTDEV_ADDR) \ + mov.a DREG_DEV_ADDR, DREG_TEMP; \ + st.w [DREG_DEV_ADDR], DREG_TEST_NUM;\ + debug; \ + j fail; \ +pass: \ + LI(DREG_TEMP, TESTDEV_ADDR) \ + mov.a DREG_DEV_ADDR, DREG_TEMP; \ + mov DREG_TEST_NUM, 0; \ + st.w [DREG_DEV_ADDR], DREG_TEST_NUM;\ + debug; \ + j pass; diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index ed378e7840..11009fe433 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -180,6 +180,12 @@ for target in $target_list; do container_image=debian-sparc64-cross container_cross_cc=sparc64-linux-gnu-gcc ;; + tricore-softmmu) + container_hosts=x86_64 + container_image=debian-tricore-cross + container_cross_as=tricore-as + container_cross_ld=tricore-ld + ;; x86_64-*) container_hosts="aarch64 ppc64el x86_64" container_image=debian-amd64-cross diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index d64a99b95f..3b048e49fa 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -3,6 +3,8 @@ TESTS_PATH = $(SRC_PATH)/tests/tcg/tricore LDFLAGS = -T$(TESTS_PATH)/link.ld ASFLAGS = +TESTS += test_abs.tst + QEMU_OPTS += -M tricore_testboard -nographic -kernel %.pS: $(TESTS_PATH)/%.S diff --git a/tests/tcg/tricore/test_abs.S b/tests/tcg/tricore/test_abs.S new file mode 100644 index 0000000000..e42240159a --- /dev/null +++ b/tests/tcg/tricore/test_abs.S @@ -0,0 +1,7 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_D(abs, 1, 0, 0) + + TEST_PASSFAIL From patchwork Tue May 4 10:02:10 2021 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: 430861 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3654341jao; Tue, 4 May 2021 03:21:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUeV3twgfazczcsAUeeBDYyJwyF2fUaL/6YDgoZ9uY2HdFEJNa6Xv1nz+RFqC83mCBRqkT X-Received: by 2002:a05:620a:2283:: with SMTP id o3mr11130593qkh.157.1620123705313; Tue, 04 May 2021 03:21:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123705; cv=none; d=google.com; s=arc-20160816; b=IIXD+HmIEW9lZKQWN6tRtuY2eubdOcjHU9YaHGhzl+7nAlcDHv3Lk1FAsvmXeeLviY nKEz6SsZIM5n50Jt7mdMLhVRu/LjR4AiP8tdIhoscf4qHf2rO4udXuS0iIyaw7aa6Xhe MeKbhTSdlpX2DhlZlac3CQjmyDtaLF7cjCZ7C6H77pKtMRJrMzWo1qtNAasvvo16Q+M7 ngpoHMWQnfWiDrUpp5LSHYx8EY0PXa1juolioyV+4ARXcIYzxAAP6+49PLD4H9C5g7VO ggW6YKcLZh4iAMGDIEuE9w9kH0pu/CyFr55jx8XV4tv6FxKMVLwi5z5bZ5Y3gm/rqSE4 vtUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=VIg7qw3G3Wf81cGSwkWP+w1Bj/vvGUaYloDj5g7DKuk=; b=oue6bTFF2Mi2KWJunB36KVFtLmTNSkh83GQPYRYZT1AisTl242aoToDYs1hRxmmL+K CO9a7cp2oQ6wk0SO2vO0/+q78loWmbtoriz8lPqDn2OlW9GyavyhO/+ct11Wuwfa1sgu jIDSXVsoDqRJMZus4nlpOu29VmpMYjwsqVnYlocWI5/9x1SYC8CLbcV9qaroOqOOCyvq qwra0e7fY6q5hYZt5wxnZug7I2Jtzwg72eVSyxC5LsuneVInnnDo1yQgvTE86lg3norR YrNfqFi/TjEP3Gu1TvJj/Xp/d7ThvnZwJomg7SUcXEOC0cRlM8Mzjkb/mkXlHuBSEXpA oYkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FDlnAigc; 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=fail (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 j6si7023202qka.207.2021.05.04.03.21.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:21:45 -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=fail header.i=@linaro.org header.s=google header.b=FDlnAigc; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsBU-00087v-Ne for patch@linaro.org; Tue, 04 May 2021 06:21:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrtI-0002qL-49 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:56 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:38425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrtD-0003KQ-Ef for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:55 -0400 Received: by mail-wr1-x42d.google.com with SMTP id l14so8714316wrx.5 for ; Tue, 04 May 2021 03:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VIg7qw3G3Wf81cGSwkWP+w1Bj/vvGUaYloDj5g7DKuk=; b=FDlnAigcmVqsUz/ib+VHHpjag3s1EC4630KUjrhFuUmqOVAgNQUSoK58JXgqX1USJh HSeW2ccrFrT36kUrpMfMgrNtk6tEl/YEIFfd2T1fYwm4lrtBXw9w3C/aD4KIkVXruyUh sPFQ0I73rDnf6JuCekxaDEBn3LgV1+cNulVG8pbF9jlKm1++W9rmPs1RO6TCQbylggkq 2nrjMRdzeY9Mb18oO+srmqwuonsRu78OcP75V4N6nYxZDpMUqFsxWgG1WXzBEa+7tAJW XSEBY3bXQFOqgoy8LdVIeJ1x9WfPj9LENbrAJQR71QbAiKZZ8DuU/UjPlMQC5a6AKAHG ZJvQ== 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:mime-version:content-transfer-encoding; bh=VIg7qw3G3Wf81cGSwkWP+w1Bj/vvGUaYloDj5g7DKuk=; b=VhWjHS9H7aFB3TQzQrFFVtZxCO0xfDMxXEorUJIW5dSxOyzyxDt4XMVXjigz1iKICh QoNqvRZEveGCO/iaHnzNAyUnQCkd31LkNH+l90eCLhe+MbkB1vPOcXiq/Cb62rxZoW33 ohaYbh/a9aVe3K/aGsbLAyGPNLgDRQHFQ7ZrgjGQv0sugZeS+zk09uMLhgQGLqOmOlTq RpgjG/GsBLG67p+fL/if3bcBkxQ/QwEx/Sym2btJFvhIamj4YhhB8aTxEKzSu5ljfovg PcfYqRUdxznCz+B6CnHjdY4ZvtGIGsT45m4nI6sfEvVxDDQ7jY3ECoYLEL+ZGiQwnnt8 CxOA== X-Gm-Message-State: AOAM533XmAfXkPLw7C+1Mr/PicmJY1ASfaeo6WLgRiXYlNDQ4cOATRcr Xu2goyv8ZKv3xGjmyVV1AR3JVw== X-Received: by 2002:a5d:54c9:: with SMTP id x9mr30224776wrv.91.1620122570129; Tue, 04 May 2021 03:02:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w22sm2037790wmc.13.2021.05.04.03.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5E28E1FFA5; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 17/30] tests/tcg/tricore: Add bmerge test Date: Tue, 4 May 2021 11:02:10 +0100 Message-Id: <20210504100223.25427-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-8-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/macros.h | 24 +++++++++++++++++++++++ tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_bmerge.S | 8 ++++++++ 3 files changed, 33 insertions(+) create mode 100644 tests/tcg/tricore/test_bmerge.S -- 2.20.1 diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index 76c133132a..52aa936c56 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -8,7 +8,10 @@ #define TESTDEV_ADDR 0xf0000000 /* Register definitions */ #define DREG_RS1 %d0 +#define DREG_RS2 %d1 #define DREG_CALC_RESULT %d1 +#define DREG_CALC_PSW %d2 +#define DREG_CORRECT_PSW %d3 #define DREG_TEMP_LI %d10 #define DREG_TEMP %d11 #define DREG_TEST_NUM %d14 @@ -24,6 +27,17 @@ test_ ## num: \ mov DREG_TEST_NUM, num; \ jne testreg, DREG_CORRECT_RESULT, fail \ +#define TEST_CASE_PSW(num, testreg, correct, correct_psw, code...) \ +test_ ## num: \ + code; \ + LI(DREG_CORRECT_RESULT, correct) \ + mov DREG_TEST_NUM, num; \ + jne testreg, DREG_CORRECT_RESULT, fail; \ + mfcr DREG_CALC_PSW, $psw; \ + LI(DREG_CORRECT_PSW, correct_psw) \ + mov DREG_TEST_NUM, num; \ + jne DREG_CALC_PSW, DREG_CORRECT_PSW, fail; + /* Actual test case type * e.g inst %dX, %dY -> TEST_D_D * inst %dX, %dY, %dZ -> TEST_D_DD @@ -35,6 +49,16 @@ test_ ## num: \ insn DREG_CALC_RESULT, DREG_RS1; \ ) +#define TEST_D_DD_PSW(insn, num, result, psw, rs1, rs2) \ + TEST_CASE_PSW(num, DREG_CALC_RESULT, result, psw, \ + LI(DREG_RS1, rs1); \ + LI(DREG_RS2, rs2); \ + rstv; \ + insn DREG_CALC_RESULT, DREG_RS1, DREG_RS2; \ + ) + + + /* Pass/Fail handling part */ #define TEST_PASSFAIL \ j pass; \ diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index 3b048e49fa..de6a2cc88e 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -4,6 +4,7 @@ LDFLAGS = -T$(TESTS_PATH)/link.ld ASFLAGS = TESTS += test_abs.tst +TESTS += test_bmerge.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_bmerge.S b/tests/tcg/tricore/test_bmerge.S new file mode 100644 index 0000000000..8a0fa6d3f6 --- /dev/null +++ b/tests/tcg/tricore/test_bmerge.S @@ -0,0 +1,8 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_DD_PSW(bmerge, 1, 0x555557f7, 0x00000b80, 0x0000001d, 0x0000ffff) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:11 2021 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: 430862 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3655748jao; Tue, 4 May 2021 03:23:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGiOP5wM6koniZZllCj95eKszcAcmDZg0bhNTIxxf62BIgoaX/TVFT4iJvqBnq2XAjbDn+ X-Received: by 2002:ab0:35cb:: with SMTP id x11mr19317642uat.20.1620123837147; Tue, 04 May 2021 03:23:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123837; cv=none; d=google.com; s=arc-20160816; b=w/Lo62AukVGZVSEvseryEtQrLte98aQ/dgQS8eVhThLicM1uDrtiLGo/eP+PH7QRSG 4mCYpFu2mq8Mpp5DPNKldNw33klFudTMBlUV6amFpLwdQxykhFeaJ7xnVcLC1GlJFEg5 ylAsrdJeL+M1oCjechwlC6l79LOudCCcv0TXrivsdo+gRbIEQ4SkMI0JYcHA5iJl1xxE aH8rb5QQ4mpg5wluX023AjfCSu64ZlcapBTTemPKWLmpQz/QVTHv3CcahXrJFv70FgDY 0qmwk+aJ19vOTqIuA3Iu56/Ion+j037YtJrojkX81gS5uv0HQR5cNaz2pSlrjiEJEKmt xRRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=2ZxifPNhE6akX9+XYZwzCV/eA4ZYz798fnoOHTBKs+o=; b=a40bCU7Qzf6VEdiULqWdpd0cT59IVLg56ar17IWnhUKQyJsJDrZkr5lLS92ldR/bek yJ77gEUiZp2w10ZX8wyGMoS8qVSlf2F3KrUiVgJ3thAV7hDY5l2ECvexEc08zsaWuP7A heZHsXBra8XTtm5fdrgpZmhOnWgvZlDUBgnBS7fC0kYdxs1VSnCRJegI+0w4FEw/iDcQ GYgZ9JmGZm2SIc99FheIYNfm59dvG07VegvtMahM2hpPVvSky2fPLn2lt/4BWZSVZ40G TNsHqssdfu0tB8uMobDCnq/bAi+pE063z2U/GsRjRyC89oY0uQI4ZrLCFSfWxF1mCu9p twWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zeA1ZthK; 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=fail (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 k184si7228137vkk.82.2021.05.04.03.23.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:23:57 -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=fail header.i=@linaro.org header.s=google header.b=zeA1ZthK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsDc-0002yJ-If for patch@linaro.org; Tue, 04 May 2021 06:23:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzv-0002a7-8e for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:47 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:42742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzo-0006ny-NR for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:46 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 4-20020a05600c26c4b0290146e1feccd8so971610wmv.1 for ; Tue, 04 May 2021 03:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2ZxifPNhE6akX9+XYZwzCV/eA4ZYz798fnoOHTBKs+o=; b=zeA1ZthKV+aDW0ewWfmgVxeLk4ii0s7dRzW1GC+IAjNw1oKTvEysfza2LuJkV+3B4Z hDsrlk6xsC+9Zdj+WMVfGYILKUtGzNO75ZyZvSnfo6/m7jK+9ht50R6M3mnYy4FilLfr 77s2a6pgAxZu4s/b6WF4RsUWYJRVUlUhSWo92ma6BrOTEEDspDf7DMwIAOKK4hOXQkll fflo3jpoNrd40Dv4s1iTBWhEFS7bb1dUNWVMPO1/M0KtUHv8JX0Ftj8SyTrm9O1OeBkC IGFpBLZUhLINBA80XtNVcju9j3zpAgXnLSijsCl5uofnO7umjeBZ7cBm+6tgm76gKlEm F80w== 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:mime-version:content-transfer-encoding; bh=2ZxifPNhE6akX9+XYZwzCV/eA4ZYz798fnoOHTBKs+o=; b=ETMh7hG3Oo0unRNbHHPsKqvaVotj/kpGcL7Gq+C0FUcfEGWWHQjNc+7FbCqP4NAgxL pIqkdeM5ysyty03r6KD723SpsqZr9CUZ9PnoDlOnaDeKxBeeVbtwOW4U0iQz57Kq66Ez Bi5sfhqMdx0G0O+oZz2L15d1Hd0OZtuHZRnENS4OcO+qdVrnhANb9XRQ9fv2kuQX70Q4 GNDbHJbtjvMwBerPkGe5dZeOSKcq22QSjQGsBzmw4lJIJ9ykcVgxmZAQDcqdlgdzRcoH EhOEvX2KnFZN5nf1yR6LDM+zwvWlVB7WQuVP8FBJxbgiofJoC738Rfg06Bbktw1xxOy5 GOkQ== X-Gm-Message-State: AOAM532o1hoBu1b5I9CjXF74xgI88SEvgIceV6XGqC7UYtHJkfFEucv1 U35iwhoNEb6I8/FWvXKoPnjHW8rPhT04Eg== X-Received: by 2002:a1c:804a:: with SMTP id b71mr26574994wmd.82.1620122979350; Tue, 04 May 2021 03:09:39 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h9sm2159123wmb.35.2021.05.04.03.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 78BAD1FFA6; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 18/30] tests/tcg/tricore: Add clz test Date: Tue, 4 May 2021 11:02:11 +0100 Message-Id: <20210504100223.25427-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann [AJB: dropped duplicate Makefile] Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-9-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_clz.S | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 tests/tcg/tricore/test_clz.S -- 2.20.1 diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index de6a2cc88e..a9b81545e2 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -5,6 +5,7 @@ ASFLAGS = TESTS += test_abs.tst TESTS += test_bmerge.tst +TESTS += test_clz.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_clz.S b/tests/tcg/tricore/test_clz.S new file mode 100644 index 0000000000..e03835f123 --- /dev/null +++ b/tests/tcg/tricore/test_clz.S @@ -0,0 +1,9 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_D(cls.h, 1, 0x0, 0x6db17976) + TEST_D_D(cls.h, 2, 0x000f000f, 0x0) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:12 2021 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: 430844 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3650837jao; Tue, 4 May 2021 03:15:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyi1lCcyEAVEgHlKx9gm8xN/0GfPeerqmoA4o5CvS8JuhA6U0Fv17M8XE0cysD1HCcDA2NZ X-Received: by 2002:a67:ff1a:: with SMTP id v26mr20855853vsp.38.1620123355156; Tue, 04 May 2021 03:15:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123355; cv=none; d=google.com; s=arc-20160816; b=QLHAqhKzVtceWMdqmmeulyu2SFNOmoc8qoIi3+nHahbhLQv7+TH89jvm3WTm7BDnRC mJ7vaVr1aYkEYuK038+nFL27j4fS+retokls9oNJshQ8/1lk+UvrZKqZVHkhhJ3OZFz6 i347L2PbvxTjQiro2LhKeazvwrA1t5ck81+utU6Ztg7Fr9n6mulk/xcc0p1hSlIE7iOl F1qaHIi/9FEd9tXH/gVp7UGLfIDJKKyhYrqtfsAZqEBg1TKCUzUNC3UWxtbrtYp9+Qws x+mVQ1CQrowLnknSKdi/zFQPs0UEBbZ6nV0CzQT8g1O4HsQZqkvazDuJkJgB3fWW7vpX Q00Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=oqpvL+FTeb8gxiE0Ls/4xrGbn7FVvV4JNtq3sVPSwPU=; b=FnZjXauoXY6TR/7LQYDlGqFiFRUKySQd2PubkHDLRbZTo5+IIhUiToxkKHsGY4pxGO zasYxB67zozOETgXdn1fLl80T6sl2R+9jQBkgjXyHqkZYidxCDGaubun85Ydn2HF2k9r 6dSxAMniDr6rpSpHLeFvv6eIIaupYWb04rSCnSgN1YejhOiGadi/yQd5yqqwZACRrDGB cBwKlx/k89UFVskoA20/MFV+9MJ9WOzfp1uyfHm0MnNuj9k1RH8BCO2yYlIbMnJfZZXG x4t7hFIXil1x0s2I73f9OmUE5k0IiK8WFiHyDlfzbCZ0owidirp6VT021OM/Yn6AbA9S C0pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Yfu5YDWt; 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=fail (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 n13si6853025vsj.344.2021.05.04.03.15.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:15:55 -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=fail header.i=@linaro.org header.s=google header.b=Yfu5YDWt; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds5q-0000k3-Ef for patch@linaro.org; Tue, 04 May 2021 06:15:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzi-0002TH-FC for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:34 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:38501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrze-0006ks-Ei for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:34 -0400 Received: by mail-wr1-x42f.google.com with SMTP id l14so8736123wrx.5 for ; Tue, 04 May 2021 03:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oqpvL+FTeb8gxiE0Ls/4xrGbn7FVvV4JNtq3sVPSwPU=; b=Yfu5YDWt1kROwdXgpCxQu5TwwN/V27VILSfjAxKq6CH7blNhHwLybyX6ZcNLqCLT5s H1u15ukSn1bcFOjNUv0xfYv2+3A1VAsyD0gWug/IU+48lASSl3FtmX6eCE6lJ78JHuU1 +wehIJvm5+M44Rmj8yjoT5FE1T50BxBjbZMxRxLkwP60EAJ1bjRnsdZC75DaSljEL29h yQyPzBjvxoRIq5o5IrVw4WpsKvYOmWJ5yNrUJ7MqlbHoIaYWYEb4gMVaSBGJCBVwr4Y6 5zIr3BSyS36ZdfgfuC0KhNcCClUaHluXBaHsG+AgOpIoVxmTbumf+9xlC8+rgUiFo0MG EN+w== 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:mime-version:content-transfer-encoding; bh=oqpvL+FTeb8gxiE0Ls/4xrGbn7FVvV4JNtq3sVPSwPU=; b=kdxfkFMOUdVhl5+sPRTh3qGzonKYRxnl4YkH0gTYxH5+qFzHQYMq+x59jtRwC7nnyE hSESaN6Yxz68JilDlMnYkuC++5AwjR300Xl/LTbRRf5wp6bKqzA8k4TDoNauLY0xV/YB IkKGJOFJKV5te3vxw7TziQM/xUq4inKuntEj86w79a5iqGE8qS49GUODC0+CsZ4JZo2k lviEUH3BSDDWJQJH9QEk+7n9rD45Ymon2Cbc5LZI/gwWkn+KLSbrfvnTkRZvPBWAEtCO fqSjgKJjlIftKbYHLAjxuaAVodVGZhzGg3KloQFHHuG16F0s6knsLVuM+wP+BF+m8cKR QYSg== X-Gm-Message-State: AOAM530JvrVF0QuV1KqDEkxsQiac4n20+WiOIE4COCMcGHeSQymZ0yFb 10ZGPuG2LI+/zncYuMtKe9zbfw== X-Received: by 2002:a5d:40c3:: with SMTP id b3mr31406397wrq.304.1620122968721; Tue, 04 May 2021 03:09:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e8sm2743452wrt.30.2021.05.04.03.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 94A511FFA9; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 19/30] tests/tcg/tricore: Add dvstep test Date: Tue, 4 May 2021 11:02:12 +0100 Message-Id: <20210504100223.25427-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-10-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/macros.h | 29 ++++++++++++++++++++++- tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_dvstep.S | 15 ++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/tricore/test_dvstep.S -- 2.20.1 diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index 52aa936c56..59b4b9a352 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -19,6 +19,18 @@ #define DREG_DEV_ADDR %a15 +#define EREG_RS1 %e6 +#define EREG_RS1_LO %d6 +#define EREG_RS1_HI %d7 +#define EREG_RS2 %e8 +#define EREG_RS2_LO %d8 +#define EREG_RS2_HI %d9 +#define EREG_CALC_RESULT %e8 +#define EREG_CALC_RESULT_HI %d9 +#define EREG_CALC_RESULT_LO %d8 +#define EREG_CORRECT_RESULT_LO %d0 +#define EREG_CORRECT_RESULT_HI %d1 + /* Test case wrappers */ #define TEST_CASE(num, testreg, correct, code...) \ test_ ## num: \ @@ -27,6 +39,15 @@ test_ ## num: \ mov DREG_TEST_NUM, num; \ jne testreg, DREG_CORRECT_RESULT, fail \ +#define TEST_CASE_E(num, correct_lo, correct_hi, code...) \ +test_ ## num: \ + code; \ + mov DREG_TEST_NUM, num; \ + LI(EREG_CORRECT_RESULT_LO, correct_lo) \ + jne EREG_CALC_RESULT_LO, EREG_CORRECT_RESULT_LO, fail; \ + LI(EREG_CORRECT_RESULT_HI, correct_hi) \ + jne EREG_CALC_RESULT_HI, EREG_CORRECT_RESULT_HI, fail; + #define TEST_CASE_PSW(num, testreg, correct, correct_psw, code...) \ test_ ## num: \ code; \ @@ -57,7 +78,13 @@ test_ ## num: \ insn DREG_CALC_RESULT, DREG_RS1, DREG_RS2; \ ) - +#define TEST_E_ED(insn, num, res_hi, res_lo, rs1_hi, rs1_lo, rs2) \ + TEST_CASE_E(num, res_lo, res_hi, \ + LI(EREG_RS1_LO, rs1_lo); \ + LI(EREG_RS1_HI, rs1_hi); \ + LI(DREG_RS2, rs2); \ + insn EREG_CALC_RESULT, EREG_RS1, DREG_RS2; \ + ) /* Pass/Fail handling part */ #define TEST_PASSFAIL \ diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index a9b81545e2..799b51191e 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -6,6 +6,7 @@ ASFLAGS = TESTS += test_abs.tst TESTS += test_bmerge.tst TESTS += test_clz.tst +TESTS += test_dvstep.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_dvstep.S b/tests/tcg/tricore/test_dvstep.S new file mode 100644 index 0000000000..858dbc62dd --- /dev/null +++ b/tests/tcg/tricore/test_dvstep.S @@ -0,0 +1,15 @@ +#include "macros.h" +.text +.global _start +_start: + # Result RS1 RS2 + TEST_E_ED(dvstep, 1, 0x000001ff, 0xfffe5cff, 0x00000001, 0xfffffe5c, 0x0) + TEST_E_ED(dvstep, 2, 0x00000000, 0x000000ff, 0x00000000, 0x00000000, 0x0) + TEST_E_ED(dvstep, 3, 0x0000f000, 0x000000fd, 0x010000f0, 0x00000000, 0x0) + TEST_E_ED(dvstep, 4, 0xfffff000, 0x00000000, 0x7ffffff0, 0x00000000, 0x0) + TEST_E_ED(dvstep.u, 5, 0xffffff00, 0x100008ff, 0xffffffff, 0x00100008, 0x0) + TEST_E_ED(dvstep.u, 6, 0x00000100, 0x00000000, 0x08000001, 0x00000000, \ + 0xffffff2d) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:13 2021 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: 430846 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3652491jao; Tue, 4 May 2021 03:18:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3krwDJH7I+8WFSEiYwieO9JWr5XsjQ8r3rdP51F4S8VmShzcTDEnt3W6gdvizLfdw0BYW X-Received: by 2002:a05:6e02:1aa7:: with SMTP id l7mr13000824ilv.307.1620123519130; Tue, 04 May 2021 03:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123519; cv=none; d=google.com; s=arc-20160816; b=cbjpukk8/tamKUnBY6h9a6RJ3NSQxqholn3+bUzonV9j1yedQZAYptfUhBVF6nntwm nVzflWlNNpx7y8bD9Bcjup2dzj10zfEKeQu8pc6IN1ipvnDdrDJmmBqf9YkS1vPvDhaE RNqSj+6QVywMxd2bH0Dqz6uB6nfYW9URINvdR6WnzmyevkELlgNEtIUwTHdn+9blFMyL YqZCJpcCtC7E55TTkHSFmqLYHwZadohIZmK7e5QzQePPKWkixE8N7yIxtxsmI8E/0yYJ IremJUO36Xj5nKirgemp2sM3zY8d6qLliJfQWAbbRJPZKimjr2FmlMFzTtwI+SBHFCT9 KTEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=W3QCFg4rZyHqfbRiyHYU4Bw92Jp5yMYeql9KanhH+/E=; b=nOA8PnyGpHR3TaTRAW0y8YHQXiGojAqyRcLd+zqTp6WAmj6V7FD6Hro9HMbijmy0TR 7sSkbWViVALNh0Nf6fUMYp7x7nRC207UiiW+mGheofbeHL/xw1YXk/QitQhCaiigo6kl OeTEVEnL8Fv1+aNhtbPX2xRe3f23ofoGjyEWMwPX/mbT5LH3EFS9Vu9YqD2CJnM2/sWP Ym0i2QkKGpfdy7hopU7hCTyufLd4H3SksV/YltGwvu8uJRYMMDYmB2y6CX5IObFnWLPG ssHHUO3Y1eiT0ugvP4q1V11MCwmYkblv6a2S38av08w4tt1nQE+tLrbhAkp+qOqtSIdj B2NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=whmSIw4f; 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=fail (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 t3si14980999ilj.139.2021.05.04.03.18.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:18:39 -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=fail header.i=@linaro.org header.s=google header.b=whmSIw4f; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds8U-00044E-Iz for patch@linaro.org; Tue, 04 May 2021 06:18:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzq-0002W8-Dc for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:42 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzk-0006ms-R3 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:42 -0400 Received: by mail-wr1-x430.google.com with SMTP id h4so8699653wrt.12 for ; Tue, 04 May 2021 03:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W3QCFg4rZyHqfbRiyHYU4Bw92Jp5yMYeql9KanhH+/E=; b=whmSIw4fAYZRObr6jDqtgf9ynUghRQo2Fz1I0nEzYJiw9QWATjEddk14XcblDxH/1c ts/GMduiVeyYJ2DUc9WEdBkEXWjQ+Byqiu3rDRMHtoOQ4ynajG7TrA2DqjXUrBGmBYDE 8lkrrQQM4Kp2uRLPO63tRoT60oXL1+3ZL5zErtOZK+SJC8SBUYSk/v3+KJR3BPLC3xSu Ay5t4pYhByrc+U4SkDy4K0/cVEMXkLow62p3tsr+iSN/GfGCVne1zXSiru9ceCkTiXkw hLFLhF9gJJAA6TowNF9syLn8A7O4y3WdDk02Ocb0VmuSsydsR6nta6MpdG95kkUCMHcU ghIQ== 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:mime-version:content-transfer-encoding; bh=W3QCFg4rZyHqfbRiyHYU4Bw92Jp5yMYeql9KanhH+/E=; b=aZ+tFfnENPqMGeok3ibjff8NBmKY97rGsRvnsyfD/Mql/vY6pdpXGV9yllmi2duR8n 4bD0AS3slV00ZQoh/qr5JNpy+/cvNTZkgU+5uKe8npk7RDhI+jZ+uUwDrjNiZxSGB4yq 8bqSj9XPyOa3xDSd7RzMH41oqxsozT6a0E8TCN+C1U7We7CY6secW0I5jQqeDiyze9Zx smX2MrXBlvjJH0sze4G4uKQGyamLYm/2kDSLPS60Og5481Ed1RZvOxYT7sdJjmOOrjtR +FmFmCSUrCajDZH380sv2NOlF4surIEXs+Os7GblNbw1FSNpD7f/zcwBr99wHcbnjSxi zCSQ== X-Gm-Message-State: AOAM533050e+VEGZctpX+xBq3gMFdQSdVYsl3cRex6F98CqWpgL04kXr lXPfRjH5t0tOO1VDl9pXFaUL847ntu93EQ== X-Received: by 2002:a5d:488b:: with SMTP id g11mr4601523wrq.317.1620122975420; Tue, 04 May 2021 03:09:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m13sm14995471wrw.86.2021.05.04.03.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD2A21FF87; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 20/30] tests/tcg/tricore: Add fadd test Date: Tue, 4 May 2021 11:02:13 +0100 Message-Id: <20210504100223.25427-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-11-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_fadd.S | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 tests/tcg/tricore/test_fadd.S -- 2.20.1 diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index 799b51191e..e7adb16af9 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -7,6 +7,7 @@ TESTS += test_abs.tst TESTS += test_bmerge.tst TESTS += test_clz.tst TESTS += test_dvstep.tst +TESTS += test_fadd.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_fadd.S b/tests/tcg/tricore/test_fadd.S new file mode 100644 index 0000000000..1a65054803 --- /dev/null +++ b/tests/tcg/tricore/test_fadd.S @@ -0,0 +1,16 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_DD_PSW(add.f, 1, 0x7fc00000, 0x00000b80, 0xffffff85, 0x00001234) + TEST_D_DD_PSW(add.f, 2, 0xf9c00000, 0x00000b80, 0xf9400000, 0xf9400000) + TEST_D_DD_PSW(add.f, 3, 0x8bb858ca, 0x00000b80, 0x8b3858ca, 0x8b3858ca) + TEST_D_DD_PSW(add.f, 4, 0x00000000, 0x00000b80, 0x000000ff, 0x00000000) + TEST_D_DD_PSW(add.f, 5, 0x7fc00000, 0x00000b80, 0xfffffe52, 0x0a4cf70c) + TEST_D_DD_PSW(add.f, 6, 0x9e6d5076, 0x84000b80, 0x9ded50ec, 0x9ded4fff) + TEST_D_DD_PSW(add.f, 7, 0x00000000, 0x04000b80, 0x0000e8bd, 0x00000000) + TEST_D_DD_PSW(add.f, 8, 0x7fc00000, 0xc4000b80, 0xffad546e, 0xffad546e) + TEST_D_DD_PSW(add.f, 9, 0x7fc00000, 0x04000b80, 0xfffe0000, 0x08130000) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:14 2021 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: 430849 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3652946jao; Tue, 4 May 2021 03:19:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyH4dCR29YaB4pABbQaDchUCjigNHeJifJaHRWRhhwxsNDA2pkaiITyKf6mz0z6EBBY6c56 X-Received: by 2002:a02:a88f:: with SMTP id l15mr12763748jam.86.1620123565371; Tue, 04 May 2021 03:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123565; cv=none; d=google.com; s=arc-20160816; b=fdpcdSb8jH8lEvmQJVGZfePo5U4p3/VWgSoGNkW3Sz3ut2NZPfVNdo3pfB3iG8pV7X a0537EwzBB0iG1ABUyA2wthA0JGSipc1ITJrTS6kFGawZwLwqYZlW+4no1EXpTNvtsVy 0Y1dgvs0BrnBVMCX3zNduTpd1gCAo80BDj0Xs7bvrN70isbFpXvu8/shDyu161AY1RbS 6dD7U8F3YHMmdvUTsJjEpoap4UaNlDWjPSL3aKySf4dRQdS/39WSRzewu+L+1y39nOhi t8uimiowUTIQAzOCdNBX6c9YjGa4qOdaxwADms393XEvc9CHMd6eefOF5FlisuwNSQo6 nmig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=nkuvcu0WvoFkCO6R6g7fnkEZFEV/3ybgOm0lAYLlrqw=; b=OmhqC8tFwBqIlrzFG0U9gFq+DK679YI953ONBoeOXZdzIprepc0PzgSHDUKxZ9S7EO sTjVLV7IdO53knm52ONZoDSPxALh4ZUowH6yaiAm4OfGzCtl3u61D9udcPd3KVbwpW6+ wCkqlwLr5eN7WdoawPHK6I70WJAZRI9YD2cYrGJaYiE6Q4KFTHYoA3+53/TlfQpg+KzG A5u3GpZhWqsXH6TyVL1QdO+/la5Gh4aIkIuJIvQCTOpdeY7iaVcAYvtly7gojrEppv0p wkpG8vQhXnqeO8PYOqQUcMMoEFX2+cdRIjv8XSb8MhmLcfX6tFnPC5tTK0iL2uXCutFp 9nKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KRpXslWK; 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=fail (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 b9si19458042ilo.104.2021.05.04.03.19.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:19:25 -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=fail header.i=@linaro.org header.s=google header.b=KRpXslWK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds9E-0004YW-Rq for patch@linaro.org; Tue, 04 May 2021 06:19:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrtD-0002pT-8s for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:54 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:36687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrtB-0003Ii-Fg for qemu-devel@nongnu.org; Tue, 04 May 2021 06:02:51 -0400 Received: by mail-wr1-x436.google.com with SMTP id m9so8724762wrx.3 for ; Tue, 04 May 2021 03:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nkuvcu0WvoFkCO6R6g7fnkEZFEV/3ybgOm0lAYLlrqw=; b=KRpXslWK1iTNAtJa6YcmhrqYkJvVLV7m8t3tsmp/wPJYtkFpFS71s1+ZrmpVkw5YyB POs+kP+E78V5ivEaWrNi0F3xen7l6l2fdJyVjEHj5R9eEqd2qUWmRZ8zRnl+IRU8Aq+8 6RiFPE+GipkkKEKdGNi/IrN1J/TN4rEMIF7A53/t3ZDLXOe4hZqssz6HezJVbRqyyfUg buz48Y6Yf93+RW2J/LMILQ/KHCQzkY66kxqgytRpIlk4Wl+kCCW854sPcHdN4f2S03JP BZ0aE4x7PRFmLkPkPx/WH2FutETtEHiqeP1slDB9quXI/0WdUXxE789cFVuDnEoWGoWW 5x5Q== 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:mime-version:content-transfer-encoding; bh=nkuvcu0WvoFkCO6R6g7fnkEZFEV/3ybgOm0lAYLlrqw=; b=sZd2WHSdLhoFFRBsxffEd8ajFBp7JYhIRbFsCpocAwHumAxZA+XP45OWJ45F7UA+5s 1oPpEtIDoCar8zGhBHqf1CAwbCzEZcswgfsBlvLIB5B01sYDoOLlFYr51qHxSOggko95 liFyQTo0TkkG00PXoFOJ7kDmqWv/XVJMA5ER+4qIOtm88qVujE4GZYOq4Rz3N2827wkg VpT0zHRis2cY2GJtJT9DymZV5LVw0wEolPd12/DM45477zkocV7yPobLxrlcNEWrEG8+ mLkpky/wFj4uS8gyz2Trl9reBk31IOWurPxNzP5LbVykBhcfg6BKMlOgLz3jKC6LrVj2 464Q== X-Gm-Message-State: AOAM531Ks74fjRFOMBToxyWcIMXdmUT1SbYvWsbuqZ+cz5AM0evLS/Cu Sjah2cxXuF3pJUl1Aozpj8dBVQ== X-Received: by 2002:adf:9bd0:: with SMTP id e16mr16167579wrc.346.1620122568086; Tue, 04 May 2021 03:02:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v20sm2080568wmj.15.2021.05.04.03.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:02:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C96401FFAA; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 21/30] tests/tcg/tricore: Add fmul test Date: Tue, 4 May 2021 11:02:14 +0100 Message-Id: <20210504100223.25427-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-12-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_fmul.S | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 tests/tcg/tricore/test_fmul.S -- 2.20.1 diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index e7adb16af9..34da1f37de 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -8,6 +8,7 @@ TESTS += test_bmerge.tst TESTS += test_clz.tst TESTS += test_dvstep.tst TESTS += test_fadd.tst +TESTS += test_fmul.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_fmul.S b/tests/tcg/tricore/test_fmul.S new file mode 100644 index 0000000000..fb1f634b2d --- /dev/null +++ b/tests/tcg/tricore/test_fmul.S @@ -0,0 +1,8 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_DD_PSW(mul.f, 1, 0x974f4f0a, 0x84000b80, 0x1a0b1980, 0xbcbec42d) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:15 2021 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: 430866 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3661820jao; Tue, 4 May 2021 03:33:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwf3FrNS8P9YyzckK0U1MY9o4xkWEqwyfC+AYdg1DxXadrcm/dlNiZLrXOto95wu8/hyfST X-Received: by 2002:a05:622a:342:: with SMTP id r2mr21431155qtw.232.1620124406713; Tue, 04 May 2021 03:33:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620124406; cv=none; d=google.com; s=arc-20160816; b=r4ip+o091amBBlu/CtdizthJ4AMKzR+sjQUv0a74TLHzS0suO+kTDl7f6avRH4n4Lb 8x/gcGidLCxsVewNt4Rt2tD1DvllBoexR7YqakWgLhe5p9GQXbo7D4iB1yVrv3Rlm2j6 99x6vG79p7CrtQuEEYBGkzgd43TlNa2jfKSjbFD3sfjjwHc/BcmUFQpFMtUfqdWdxJw6 7/6DJ0ItbZ1sI9E+IIy1bvvzwywZ3yGrDHambKJec+QAayKIcA2zRB2KrTO5SnPlfE0V 3l/zBq9RFWu7BaaBFx0jh6qSKFU40YG5OVPojnzI138DCNptcRSCyWI2AkcCVp9AsYT+ A1Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=N52YWnuZLlPx8wUlhZrUjpPfF72LihVfzT4a0wPQRGQ=; b=NND3K+Fe0ZKpX7GUQ/IyYBHNvha5yGtlfBZVJWGg1w0at+jCN1FdVbvl956LaJRhLv OrIi5VALmXkI53fTaBVm2Qc8wG7BL5CQwu4gsaDYc6b7pvzccGn/9dGg1jJn24aBQcxH ph+tQzPUu/jKzA/I/XBaO3fnBaQMSu3ThmeTVYU14OMe5YY9b0Y+ZWC5OGs65vSaE9/Y H5J2/CdYTllSWedhY6x12JX78fTKW54KyaIegt0DqXYVObXqugEeWm5wkNRGTpZc6r5M MJ5B+ZvmKXICo5QWV+S1RXgTRSP6Q5CBQmgqF2Qjxk9gXQFQmM9ozZ4n1wm1XrkgUkFO dwjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ml4+k5nh; 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=fail (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 k4si2067732qtj.384.2021.05.04.03.33.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:33:26 -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=fail header.i=@linaro.org header.s=google header.b=ml4+k5nh; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsMo-0004cc-5N for patch@linaro.org; Tue, 04 May 2021 06:33:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lds9I-00066m-0U for qemu-devel@nongnu.org; Tue, 04 May 2021 06:19:28 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lds9G-0003kJ-0i for qemu-devel@nongnu.org; Tue, 04 May 2021 06:19:27 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n84so5046074wma.0 for ; Tue, 04 May 2021 03:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N52YWnuZLlPx8wUlhZrUjpPfF72LihVfzT4a0wPQRGQ=; b=ml4+k5nhIAix7ewW6kyv9Y8HfQr2iO8dH+3b2Faqc7tCX2BPR41R6a06f0cXps5DUv byzKcAm/HT7pxW+tdq+ZVdy6kqU7GHuQy/d+9KiIQucKSdNvkPrWxYb2NP7NQdODBiBQ q9+Lc7DidHmZ1YB12JsFzLL0I4nWJa3nv9jcC/vRNTwUwLiGudd/LhDVfvl/f8AVtj1f 9MnCk5wBexPoqAh5+GXC0Z2gkAyUgS7tK7spivThoEbab1UCDnYl4mBZvwtx4UTK24d8 6z0u9Mg5Jjg2FX3V3nw02fC1HX6Zt4NM2Qrd5w38B/mVBq7E98GTMDlfJa1q7pLZeYfw uNIg== 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:mime-version:content-transfer-encoding; bh=N52YWnuZLlPx8wUlhZrUjpPfF72LihVfzT4a0wPQRGQ=; b=GechnXRZCcwB1Bl5c/Jw5kXiaQvAzUMh+F854whNBC3N1/u2hYSmxw4U6vdBbkkbHo 4BjBEExgElVEAiZvnwoA+ZFWiOmtEqsupdQjqhZOJqACrUjOuJZjrtvHQDQb9xiF57Bo /Ail/nVIEqiw2tKkr8Qazu6BHpxJ4vOhYvdx4JtdCgvnlIYbRMTTGV500kY6EGxnSbK8 93h7G/GuO8TwISMKoBCCLkqajnlvB+W91KJdKH+D+98qAw9p3CHV/ApC3Yh1xpDXpfED FbOE0AYY3HNHlop6uz5NY/00fAnXW8kw/OcgPEuHRxbykSh3yYiIISx6/T2sq4ixbuqg eIXg== X-Gm-Message-State: AOAM532EpUpPnvRvzvn9T7VhYtaWGxnFJB68H01+5SJZnB51HZQ2TBzO pmuKU5R9gnxzsRiKSu+m9eDOzQ== X-Received: by 2002:a05:600c:b4c:: with SMTP id k12mr3165039wmr.186.1620123564591; Tue, 04 May 2021 03:19:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n5sm11234319wrx.31.2021.05.04.03.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:19:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E70731FFAB; Tue, 4 May 2021 11:02:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 22/30] tests/tcg/tricore: Add ftoi test Date: Tue, 4 May 2021 11:02:15 +0100 Message-Id: <20210504100223.25427-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-13-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/macros.h | 7 +++++++ tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_ftoi.S | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 tests/tcg/tricore/test_ftoi.S -- 2.20.1 diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index 59b4b9a352..e6a41cd1a2 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -70,6 +70,13 @@ test_ ## num: \ insn DREG_CALC_RESULT, DREG_RS1; \ ) +#define TEST_D_D_PSW(insn, num, result, psw, rs1) \ + TEST_CASE_PSW(num, DREG_CALC_RESULT, result, psw, \ + LI(DREG_RS1, rs1); \ + rstv; \ + insn DREG_CORRECT_RESULT, DREG_RS1; \ + ) + #define TEST_D_DD_PSW(insn, num, result, psw, rs1, rs2) \ TEST_CASE_PSW(num, DREG_CALC_RESULT, result, psw, \ LI(DREG_RS1, rs1); \ diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index 34da1f37de..fcc7b6c1c9 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -9,6 +9,7 @@ TESTS += test_clz.tst TESTS += test_dvstep.tst TESTS += test_fadd.tst TESTS += test_fmul.tst +TESTS += test_ftoi.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_ftoi.S b/tests/tcg/tricore/test_ftoi.S new file mode 100644 index 0000000000..fb4af6b5aa --- /dev/null +++ b/tests/tcg/tricore/test_ftoi.S @@ -0,0 +1,10 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_D_PSW(ftoi, 1, 0x0, 0x84000b80, 0x05f6e605) + TEST_D_D_PSW(ftoi, 2, 0x0, 0x04000b80, 0x00012200) + TEST_D_D_PSW(ftoi, 3, 0x0, 0xc4000b80, 0xffffffff) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:16 2021 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: 430843 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3650302jao; Tue, 4 May 2021 03:15:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjjCtD1HSak3RfDI12Iab2Cm1QVeRGNMYJ1mVyymfkvdEbkzV46uYxZ1WugI+iaOUIjVwR X-Received: by 2002:a37:c81:: with SMTP id 123mr6278654qkm.105.1620123313946; Tue, 04 May 2021 03:15:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123313; cv=none; d=google.com; s=arc-20160816; b=wKKXn7B2uAS/UY8hPydsaLD5YNZImVDWIiOecDAX2PLBo0Rt6fe8jFN9Mk63SAmqrE jihWrRJRRP8eGnc7n/PrW2GjngU5j+40JFOX0tE30cpeHA+TDT8XXTOzuT4J/X3RDUqq Je7dIhwb1RjjdUSF7sPCQ8iYy9zMO6iIOrA1Yo8b7i59J9LGtSpiEAlUlHo+vDnWnVtv yjkxnzxb1GEYOWLO9OB49PFRPzqQ2lHqXQaRynV7lttzrNsv5XAu9BlewUwcOfJ04k0S +EOiDeZQNDrhY1b4WKrWWqNKdl1d2t6RvNpIu+OfKfUf2z/n8d8gg4GfBXFt5g5Y1StY k4iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=rPMh6kmt7DZA6FRYiUkJHikUFQXem/GBwsoB4cM/qp0=; b=UM0lmrsRAP/vj0PwBlCbhJPdMmrxjmH2ZS3Y4a+mGcb5fPH3cJ1QBLf9oUWr71b7HT 87N2JApLcViEq1f3ThJn/8FEH2Ea8bzU/+sr9zMwoB53BwNAi18f3SoBEyEx2a66mtND omcIaoHLgwREjqJry5JjFeDQ9JdzlG/OhEFGuShBZ3ZojekHuww80LBF0PUU9zE/uYbV +UO2GKhylVxp3SDOjyqNocL6q1fRN+OpMw0TqhikLmA6OxIgrE+bql+KBstEM9TQszYK hHHnMpX2Wqpcgf5Bilafho8MmMZ+nIYPVNlPiZyiJ871DLAVKEGW4r4+3L9sq1Wk2lJD +d2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DSplFXlB; 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=fail (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 bp18si5022419qvb.75.2021.05.04.03.15.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:15:13 -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=fail header.i=@linaro.org header.s=google header.b=DSplFXlB; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds59-0000SU-EW for patch@linaro.org; Tue, 04 May 2021 06:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzh-0002TA-8a for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:34 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzd-0006kn-5i for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:31 -0400 Received: by mail-wr1-x435.google.com with SMTP id d4so8734053wru.7 for ; Tue, 04 May 2021 03:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rPMh6kmt7DZA6FRYiUkJHikUFQXem/GBwsoB4cM/qp0=; b=DSplFXlBz7FUAmdLpbM9ccGwwZDRC+ewlR9yUcn1RTR2yD44E3Z+WHqu5MDBsKrvh6 ajW9wphWd37A4fqsaFT6i/B1v9d1vYFHtjUnCmP/vIHS4f+88aR6D3g89CiYN/pjuSDY smTU8sn4W6PEF+Qu5M2mlScBGMLMO4pF4nHznxxDMdMAq3asoJg8Eewyr6nv16ZaUmmy Qec3h/ECyOhkuUDSi2aQbdGA/fanaPoBLBEfar8j/uHA74an9ft6FQ6THIBYvDElzIfn /ElxWITHn+4y5S84fBBUCZyz+Am2fUxpWyjcw8/r0ABnU9aLF+bD6ZdKXF2Mo/oXQsfa BRSQ== 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:mime-version:content-transfer-encoding; bh=rPMh6kmt7DZA6FRYiUkJHikUFQXem/GBwsoB4cM/qp0=; b=gWdAIQ6UXO7PxVffrBBEByrr16TKN2nbqHzaIUQbP2Wzpj9ZA1SdUnIoiHWGd7uP+2 TayTwSgo5jKArLLb7zo7CApX4IKprZ42mEua9p42oPQ6jeIZfWdI04HoXp8REPx9xDnY e/cfE6N61famhO/ZMlpz+mqAUPbfzgStVOLt+I1A6GY7xzU8HSVTnnghzj/UiYKnZalM 5X2ctipw5CIN1UEL5MnP5Wa3tckZJawKvYv1lrm3MSfixABWiLNkiVyLPQ04fhKg0sjO whDJIRvrHbkiLKA9gNbL8CSt9s4mGOvMs3V2I5FRh1O9vlm6Rkx/DPI9uoJMMkNYgYKt u7oQ== X-Gm-Message-State: AOAM531HuoL/nyouh2B1klNqWAvbT+h08NfyYPWEuCFAHDxHWj6kCjt2 bcCrRTQFjjGyWr4JJuYcpbLSwg== X-Received: by 2002:a05:6000:178c:: with SMTP id e12mr30944377wrg.42.1620122967762; Tue, 04 May 2021 03:09:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 6sm2625772wmg.9.2021.05.04.03.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 131EC1FFAC; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 23/30] tests/tcg/tricore: Add madd test Date: Tue, 4 May 2021 11:02:16 +0100 Message-Id: <20210504100223.25427-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-14-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/macros.h | 18 ++++++++++++++++++ tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_madd.S | 11 +++++++++++ 3 files changed, 30 insertions(+) create mode 100644 tests/tcg/tricore/test_madd.S -- 2.20.1 diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index e6a41cd1a2..0d76fc403a 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -9,6 +9,7 @@ /* Register definitions */ #define DREG_RS1 %d0 #define DREG_RS2 %d1 +#define DREG_RS3 %d4 #define DREG_CALC_RESULT %d1 #define DREG_CALC_PSW %d2 #define DREG_CORRECT_PSW %d3 @@ -85,6 +86,23 @@ test_ ## num: \ insn DREG_CALC_RESULT, DREG_RS1, DREG_RS2; \ ) +#define TEST_D_DDD_PSW(insn, num, result, psw, rs1, rs2, rs3) \ + TEST_CASE_PSW(num, DREG_CALC_RESULT, result, psw, \ + LI(DREG_RS1, rs1); \ + LI(DREG_RS2, rs2); \ + LI(DREG_RS3, rs3); \ + rstv; \ + insn DREG_CALC_RESULT, DREG_RS1, DREG_RS2, DREG_RS3; \ + ) + +#define TEST_D_DDI_PSW(insn, num, result, psw, rs1, rs2, imm) \ + TEST_CASE_PSW(num, DREG_CALC_RESULT, result, psw, \ + LI(DREG_RS1, rs1); \ + LI(DREG_RS2, rs2); \ + rstv; \ + insn DREG_CALC_RESULT, DREG_RS1, DREG_RS2, imm; \ + ) + #define TEST_E_ED(insn, num, res_hi, res_lo, rs1_hi, rs1_lo, rs2) \ TEST_CASE_E(num, res_lo, res_hi, \ LI(EREG_RS1_LO, rs1_lo); \ diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index fcc7b6c1c9..8de005523e 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -10,6 +10,7 @@ TESTS += test_dvstep.tst TESTS += test_fadd.tst TESTS += test_fmul.tst TESTS += test_ftoi.tst +TESTS += test_madd.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_madd.S b/tests/tcg/tricore/test_madd.S new file mode 100644 index 0000000000..5d839772bb --- /dev/null +++ b/tests/tcg/tricore/test_madd.S @@ -0,0 +1,11 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_DDI_PSW(madd, 1, 0x0000fffd, 0x60000b80, 0x0000ffff, 0x7fffffff,2) + TEST_D_DDI_PSW(madd, 2, 0xffff7fff, 0x60000b80, 0xffff8001, 0x7fffffff,2) + TEST_D_DDD_PSW(madds.u, 3, 0xffffffff, 0x60000b80, 0x00000000, 0x80000000, \ + 0x80000000) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:17 2021 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: 430865 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3660404jao; Tue, 4 May 2021 03:31:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+BRey2+MIEIHzUhpS5siEXwmMOEKnmmdf0T5/2Bhb9TPWN4FXx2ySzatsZhe1HBPSAxAp X-Received: by 2002:a67:2786:: with SMTP id n128mr20378652vsn.9.1620124281903; Tue, 04 May 2021 03:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620124281; cv=none; d=google.com; s=arc-20160816; b=EwmiWq5RKdF3zrgszOgl6t2JQgA9EOhz/bVzXc8fcT8Wg170Vyo7cdmgO+vWKTJFSi RtmBJyR3klkl8/P7tpdZ5r7wUGGPcaqylrstmFN19wglWwANP3hwL3bN9+mZq1bZynU7 GiCXAHZ34Y6gSQEX8EyhyfSBTp/GELRMnk1k2ml2hA6JCzJgu9kVa3vTyu+ng/H1lGX7 3/INXI659fAQNPXEOeL9I4NUlCZb+nZ24Cvs+9CYMRFvE86toCbyi2jwnWD6Nqsrwaw8 e1NNOC2WdLsagmBhKoDWWYsPZv+sY/LaOFD8WaNsFnRmoPPV8B1da1SrpyBAeJO17gkn f/DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=fPkUtUsZBhQTOVdElvOgFTSd49w6hL06WN6K1JOPhLM=; b=jqQJAUaTQnIMrWUS6gJIz84Of/wvoYU7U/9YFRBrooKkk95ips/VK8kIVL0qkCHtmg zRIaGn+F8XhaAVqnXTRjWzZ0TaREyMqAMFrVv7xEEB6+oIPJXE+ZeTO40Za1EheMuh80 /+J2CiEItjAdZ+YMQBaVy7cNzLg0ifrioYEVDwOrmDGf5vVe9o0h6iUGA3TCdpjOYvDd pSF3EtbmMFOawC3Xhmmd5unmSpqsW3Ybfe75/2qyhnK+8XLunhByZuuRtTHV5ADGqf1O vg3+t2ECRxPrIA2Qvy7LvCQ3UiX5yXuL/2OKbPdHzuRl8Z+ejxW9lp1zW2oLyBImGW/7 RKOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zhbm91dR; 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=fail (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 i2si1612838uaq.166.2021.05.04.03.31.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:31:21 -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=fail header.i=@linaro.org header.s=google header.b=Zhbm91dR; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsKn-00039i-AM for patch@linaro.org; Tue, 04 May 2021 06:31:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lds9M-00069m-En for qemu-devel@nongnu.org; Tue, 04 May 2021 06:19:32 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:53134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lds9J-0003mY-HF for qemu-devel@nongnu.org; Tue, 04 May 2021 06:19:32 -0400 Received: by mail-wm1-x329.google.com with SMTP id g65so5036553wmg.2 for ; Tue, 04 May 2021 03:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fPkUtUsZBhQTOVdElvOgFTSd49w6hL06WN6K1JOPhLM=; b=Zhbm91dRuDHnr6HbJBE3s//Iy41g4HnJhNYn+e3o054ire1sYqKPpj2uSCJUt7wXQh MCZ6bVpvr7ITejXAADv+6mo8LHe7y+BR7Xw/xItAFXZfIwpOyi5jvBILNJraXiEWw8Pt LCQFXsQdjqJeO4mRmhu0WX3NOcw9q5wwz4tNioIdhvQ19H4XMq1ovclhCVZUSzYx/SwH KiQCYsBJQ5SfCydg/vLWMDiX3mO6WZ7cdltbBUwovDQCo/KZi2vvC3m2iYZzIfftgWyF RBkMFF9BO+zCPxoOFcEgkQ98amPCRC4qveHFY1uDoYqOlfwjXhit6PD3SqAJhSMNLdNw s0aw== 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:mime-version:content-transfer-encoding; bh=fPkUtUsZBhQTOVdElvOgFTSd49w6hL06WN6K1JOPhLM=; b=RB5YoRBfSAlGSY0lU7DLxQ1AAdWpa6Ob9SpwspxvKoRwFts8IFtHlrPUjQpp/XMbqO qBLBiUL+0yTuTEju96mX0L8GmUxloXbLFs5RvaO0iMEfI15KBvoY+t0gYFY19+ZyLEc3 666vF+aUgYPGwtt8mTFmArFqEFDUBL+fl+39dZLO7piAX5Nabc3B1fucd46tcX01+S19 8fQ7fUrw+/d9MAatKqzsajtmCX6nxdFsCBLBgWA3vonkKBFJwh2IP1vcSiga/DtT7fV5 6cuS9QQ0vzu0fka0GcgT1NVlJZ54vOBMvPpiLvWv8HYL0XnJ641ZZvHOl2db2IDBRn20 5jJg== X-Gm-Message-State: AOAM533u0gDmiVkwQgQa+eZwuAU2nGuV+eG4HZCtNvlfuPlGGrdnjQ7g AiWxh3QY1V5pPfIzWWZbq5AjLQ== X-Received: by 2002:a1c:988f:: with SMTP id a137mr19805035wme.81.1620123567732; Tue, 04 May 2021 03:19:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j10sm5787303wrt.32.2021.05.04.03.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:19:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2B4941FFAE; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 24/30] tests/tcg/tricore: Add msub test Date: Tue, 4 May 2021 11:02:17 +0100 Message-Id: <20210504100223.25427-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-15-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_msub.S | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 tests/tcg/tricore/test_msub.S -- 2.20.1 diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index 8de005523e..0fe6a86482 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -11,6 +11,7 @@ TESTS += test_fadd.tst TESTS += test_fmul.tst TESTS += test_ftoi.tst TESTS += test_madd.tst +TESTS += test_msub.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_msub.S b/tests/tcg/tricore/test_msub.S new file mode 100644 index 0000000000..6dee87d99c --- /dev/null +++ b/tests/tcg/tricore/test_msub.S @@ -0,0 +1,9 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_DDI_PSW(msub, 1, 0xd2fbe5e0, 0x00000b80,0x64003300, 0xff5420d4, -216) + TEST_D_DDI_PSW(msub, 2, 0xfffffc10, 0x00000b80,0xfffffe68, 0xfffffffd, -200) + TEST_D_DDD_PSW(msubs.u, 3, 0x0, 0x60000b80, 0x1, 0xffffffff, 0xffffffdb) + TEST_PASSFAIL + From patchwork Tue May 4 10:02:18 2021 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: 430858 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3653739jao; Tue, 4 May 2021 03:20:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDERXOyRDOLnZr4LKKkui3fB986mwiommZKiQ1jhS1y03QdWB+oW/SDGU0Cd+wBMEPFLPj X-Received: by 2002:a05:6102:b15:: with SMTP id b21mr19031162vst.50.1620123648949; Tue, 04 May 2021 03:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123648; cv=none; d=google.com; s=arc-20160816; b=iOp81DSUPuKHrgB9VoYwvF+B8wgO4GP3VF7oBPx/Yb4sSU1xBBq31OqI7yXGMRtYJY gVNyWW1wcdpwes3+Ale4FYuolmAsxOkxjb0PdanJV+NsS5KuoTYLF+O5DW+unvOCPXYL 4yUZdvCtYRFuqsYtpaKSFAxmi1FQjey6d7ujLZMY5EgjMPt66FPAvdJslaIh1sd3JVkg VrTRUoz5sCtdwWrgyR4sE0qEg7SLkYejoFPwF49+IE11MrSWF4iMtU7Eph0vZSDEWQ3W lqREA0lVuToLYQTYqjqH97/psV2vGCk5wZuA5yLj0T0AJRmkp0+9A4ILHrDPYh8mAZyK 5ptg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=UI/Epk7UI6ih8itVpTT1qnXUK0ABqNU1gp/FWYX6Sdc=; b=rXbY+vcvUXvac9nBDwWVvkGhhr9A7bQoXarmOr3XrBldR532ckyEwhrtzAUEL06Z5O vaB0+I85P4V6PHGvJofp8x/wgUGgB5U7NGPEUOy/5EM+emUMGmjdy+ulSxU1ATHJ6rzA Wrhh1VMy+wu3HQ07y0Ov0WQlRnOpSa7JO1dRSHv0M6NsyUu2oyw12zKVUgwbO1xRPprt 1gI18uD+NszQBR+2CfXsakxSSWKdBTRYleGYNEN1ucJkcJTHV3AK/2uQlK0OLkCSaYHU GwWRemYmNzcqG55tWHhrtKCzng/DF+5Tl1hrCfiaFtTT6gnNYdr4GRZMm777ZE97qhrJ cQ5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BPNVNezn; 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=fail (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 f10si1765765uax.60.2021.05.04.03.20.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:20:48 -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=fail header.i=@linaro.org header.s=google header.b=BPNVNezn; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsAa-0007xB-8E for patch@linaro.org; Tue, 04 May 2021 06:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzu-0002Yl-NR for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:46 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzo-0006n8-N6 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:46 -0400 Received: by mail-wr1-x435.google.com with SMTP id l14so8736722wrx.5 for ; Tue, 04 May 2021 03:09:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UI/Epk7UI6ih8itVpTT1qnXUK0ABqNU1gp/FWYX6Sdc=; b=BPNVNeznOTNgPgGAZdB4ayv9VXtVTMiASKdwMjRUhh6nHor+epZ0lttAP/0BS2rIzn XXTKhf/RxOa+aYFDpi6bgT8wjIVCDJnMlRhYRF9gqRum0Lu6heXScu4ScNOc+MdywH6z kxmyRdfawCbOJG7KcGAUTge5RwWYn0DyJ8xQty7dkEIRcOGgz9e+OPW7YtyTOH7rmLzZ dZb6FzjdmKqMuAZgwr8B15QZapEqAUUDPXvOsv19JWhIY4v4ThiLAkFc4sgcX0o2qAFh 0lmtmGnBrmcaaA8x3qP3Pi7/ObBSgutkBzhZAEJtZHKHKhCAJCEPqHQ37hJ4teByUeSl Temg== 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:mime-version:content-transfer-encoding; bh=UI/Epk7UI6ih8itVpTT1qnXUK0ABqNU1gp/FWYX6Sdc=; b=q9hXkDXNhj92z6V9qKSa3/gF8quFuHQ2KPyQ6mXtu1VSLs0wZvBtEXIQyPKBIRLCxA NgUGp32WltHYtiO8NwIw8roMZsbKSfpBMndMkGilkoCeNTR2/YHArDyObLN0a4Fpdukv n7SStkrT1IxHlYoHFwsFLzyiHwt9kUiT9wqzuKaorvdcf3roDwL/O6bRLvaV3seCzTso HrXglS/LZa0zQ1KN1mbLaF+ZivXGzcWfKJhW8WW3jLzoJei/vyVLvoZubZQrho94fi8M C/lb+GV5ccgT2ZeHdSbcAswJk0bfehFBbKzK3NKXcTcnRdKn/FyG7lfwon3KUaQAKVNq 3imw== X-Gm-Message-State: AOAM530gohcvN6q/ARx51nYXsI4uG1T3CWBLnyT8wSIzvjZVrUENhf/i x0ATty7rSgpbXUE/xUVJR+q69A== X-Received: by 2002:a5d:4521:: with SMTP id j1mr24270953wra.116.1620122978429; Tue, 04 May 2021 03:09:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q20sm2571121wmq.2.2021.05.04.03.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 435271FFAF; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 25/30] tests/tcg/tricore: Add muls test Date: Tue, 4 May 2021 11:02:18 +0100 Message-Id: <20210504100223.25427-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Bastian Koppelmann , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Tested-by: Alex Bennée Signed-off-by: Bastian Koppelmann Signed-off-by: Alex Bennée Message-Id: <20210305170045.869437-16-kbastian@mail.uni-paderborn.de> --- tests/tcg/tricore/Makefile.softmmu-target | 1 + tests/tcg/tricore/test_muls.S | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 tests/tcg/tricore/test_muls.S -- 2.20.1 diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index 0fe6a86482..5007c60ce8 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -12,6 +12,7 @@ TESTS += test_fmul.tst TESTS += test_ftoi.tst TESTS += test_madd.tst TESTS += test_msub.tst +TESTS += test_muls.tst QEMU_OPTS += -M tricore_testboard -nographic -kernel diff --git a/tests/tcg/tricore/test_muls.S b/tests/tcg/tricore/test_muls.S new file mode 100644 index 0000000000..ca517556bc --- /dev/null +++ b/tests/tcg/tricore/test_muls.S @@ -0,0 +1,9 @@ +#include "macros.h" +.text +.global _start +_start: + TEST_D_DD_PSW(muls.u, 1, 0xffffffff, 0x78000b80, 0x80000001, 0xffffffff) + TEST_D_DD_PSW(muls.u, 2, 0xffffffff, 0x60000b80, 0xfffffffe, 0xffffffff) + + TEST_PASSFAIL + From patchwork Tue May 4 10:02:19 2021 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: 430860 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3654215jao; Tue, 4 May 2021 03:21:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOTg2xN+Qg+mS0UWUmfQMFTvdGU+iJYpQFiNGnt0DJ2pL7CQCZU8E9Wrz3n+IQxduSH5GL X-Received: by 2002:a05:620a:2f2:: with SMTP id a18mr23784804qko.236.1620123694092; Tue, 04 May 2021 03:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123694; cv=none; d=google.com; s=arc-20160816; b=NOSXsRfSVe9W8+ocCItXPVLV2xA4h4gQPPEo63hPEzbMvGRJG6ryuk9yVk3z2PbfJN IO9ybb12jSSJ5UDkNG8kReaNdkoB6s6JGsrdJzRquGcPwQnxN+HUyBsk8GTb3Gx8CGKp Fk4w4B6mhk1PWAU3qh4Pjll2sUXcCUhA8ZZ3y3AdysfKHpghqvpyWVaU1uSnJ03Vh/H2 ZQDG159tgAjXQVXnvu/TDKfkTN9/vfdWENfUpsmb6KzlVStuarhuHtuVtGO5yIAGeJ0T ubiwmw0PzgbZVOgke3gN6Pree3fHnlXuT9kMB8FHYiBvosBJT/+byhVRjYUJuGDHOA61 7uqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=W/ukiiX+2G/6Tr/Ondx70r9sB5+hCuUswyNpWg3QywQ=; b=nosvd7pV2WrcjzGJwOJ7pmhfd+uaU8XP3L2hbqTW42ACX6f4JsUF4vsjEbxNBNxlyk G6b1w/4XWPR2FL93ZAg9FyPz9Uajq08q71uPdE7hf1I1wTidZ5/Wu48Wj6CgSaK+I7Ic TUZVPVGOu+hWwdnLeciyQL41m4e2uDnn5vjkJ6sWpOKLXAbHr5RTTDyIDKm+l7os7RT4 oveYe+D80QjAU6ZRHvGmW/2Lx1iIBRlAwuhk4ypiyZhzAsXIDUGaAf4slxCevT9eJ/4k 3rDtvIaSx+GWoDWzRDzK7ydA5XQ7mbhJnr871qoa4PSWe8IQwSLCZqbG2vj3R7HbMdrC 7bQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bNIHqwWT; 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=fail (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 j6si10261573qva.202.2021.05.04.03.21.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:21:34 -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=fail header.i=@linaro.org header.s=google header.b=bNIHqwWT; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsBJ-0000Sw-DQ for patch@linaro.org; Tue, 04 May 2021 06:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzs-0002Xh-Ma for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:46 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:41836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzg-0006lJ-Vy for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:44 -0400 Received: by mail-wm1-x32e.google.com with SMTP id t11-20020a05600c198bb02901476e13296aso992869wmq.0 for ; Tue, 04 May 2021 03:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W/ukiiX+2G/6Tr/Ondx70r9sB5+hCuUswyNpWg3QywQ=; b=bNIHqwWTi6aw64aeMkx5v/o+Uy4BHZ54DuyI48Xnbx4VFDAmkC4gIgS+MxWuevjbz2 BzTka50devAnLFoStBeuw8znCAr//V81kdRJiaRKFEFxa7WuqKR2Z0a79zXs2OsizBux VTt+ld8Qvvbnrq7Bz5C8PoRLeJnWxUm2mQiaCAV0sd92YO1xgdpj/XoINh/UiVYOpaZ7 OiTUfiX0HpanORxIaCGo/tPtbPgoNkpZFeylF1Zz5u9NjIzJVyTmsJkbxOhJsjfibK0B qTRc7VGVjbLIpXryM39jAMZI/KQezDLwJnUPQ66QTiKS77IDaSATQB5nXXCr6127JlSZ nw7A== 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:mime-version:content-transfer-encoding; bh=W/ukiiX+2G/6Tr/Ondx70r9sB5+hCuUswyNpWg3QywQ=; b=dUoFrbbXmdyj81c60LfO/D6unzINk3M1EhTH6B6e5hqbiADVMMEF0PCfGOf6hioX+M J65R2hjDy1uvHvsXEG3uFeEgJdAPcpH4QEZweO3gTWD7yFgQydurJEwBMVcIa6QHr30S 3ESuIoA8lWvy/OTvS7Unx/MDvRUnzqPs4NgtybyvfJuHrdKu0A7LfhoaYySxvWxCFPAB f2xRkQPaaNxH1m9mJRwogQzOjvzbqLZQu3XGSC1BvrRUitqvgOSXHZPab/O5wG/YTyl3 HxGuHFi0ZIVQ9rgOmFSCwQj6zXNl842Z3Lz2gRJvhBd7kEyuoxo6ldUH90k5dRZ3wTf8 f0ww== X-Gm-Message-State: AOAM530oXmuXS3Hq9vPnY4OLSoucO/p8VNS21k5niwuCQ6T+2Fhov5+T g9/EPjgaxfInAy1DpsI081O+3Q== X-Received: by 2002:a1c:7516:: with SMTP id o22mr3020447wmc.91.1620122970743; Tue, 04 May 2021 03:09:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q10sm11392633wre.92.2021.05.04.03.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 639721FFB1; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 26/30] tests/docker: gcc-10 based images for ppc64{, le} tests Date: Tue, 4 May 2021 11:02:19 +0100 Message-Id: <20210504100223.25427-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Matheus Ferst , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Matheus Ferst A newer compiler is needed to build tests for Power10 instructions. As done for arm64 on c729a99d2701, a new '-test-cross' image is created for ppc64 and ppc64le. As done on 936fda4d771f, a test for compiler support is added to verify that the toolchain in use has '-mpower10'. Finally, Unused images (docker-power-cross and docker-ppc64-cross) are removed. Signed-off-by: Matheus Ferst Signed-off-by: Alex Bennée Message-Id: <20210423205757.1752480-2-matheus.ferst@eldorado.org.br> --- .gitlab-ci.d/containers.yml | 13 +++--------- tests/docker/Makefile.include | 5 ++--- .../dockerfiles/debian-powerpc-cross.docker | 12 ----------- .../debian-powerpc-test-cross.docker | 17 ++++++++++++++++ .../dockerfiles/debian-ppc64-cross.docker | 11 ---------- tests/tcg/configure.sh | 20 +++++++++---------- 6 files changed, 32 insertions(+), 46 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-powerpc-cross.docker create mode 100644 tests/docker/dockerfiles/debian-powerpc-test-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-ppc64-cross.docker -- 2.20.1 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e23..325191627d 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -144,19 +144,12 @@ mipsel-debian-cross-container: variables: NAME: debian-mipsel-cross -powerpc-debian-cross-container: +powerpc-test-debian-cross-container: <<: *container_job_definition stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-powerpc-cross - -ppc64-debian-cross-container: - <<: *container_job_definition - stage: containers-layer2 - needs: ['amd64-debian10-container'] + needs: ['amd64-debian11-container'] variables: - NAME: debian-ppc64-cross + NAME: debian-powerpc-test-cross ppc64el-debian-cross-container: <<: *container_job_definition diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8967ecf118..ff5d732889 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -140,8 +140,6 @@ docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-mips64el-cross: docker-image-debian10 docker-image-debian-mipsel-cross: docker-image-debian10 -docker-image-debian-powerpc-cross: docker-image-debian10 -docker-image-debian-ppc64-cross: docker-image-debian10 docker-image-debian-ppc64el-cross: docker-image-debian10 docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 @@ -174,13 +172,14 @@ docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.dock docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 +docker-image-debian-powerpc-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross +DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross -DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker deleted file mode 100644 index 07e1789650..0000000000 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ /dev/null @@ -1,12 +0,0 @@ -# -# Docker powerpc cross-compiler target -# -# This docker target builds on the debian Buster base image. -# -FROM qemu/debian10 - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-powerpc-linux-gnu \ - libc6-dev-powerpc-cross diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker new file mode 100644 index 0000000000..36b336f709 --- /dev/null +++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker @@ -0,0 +1,17 @@ +# +# Docker powerpc/ppc64/ppc64le cross-compiler target +# +# This docker target builds on the debian Bullseye base image. +# +FROM qemu/debian11 + +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + gcc-powerpc-linux-gnu \ + libc6-dev-powerpc-cross \ + gcc-10-powerpc64-linux-gnu \ + libc6-dev-ppc64-cross \ + gcc-10-powerpc64le-linux-gnu \ + libc6-dev-ppc64el-cross + diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker b/tests/docker/dockerfiles/debian-ppc64-cross.docker deleted file mode 100644 index 8efe68874e..0000000000 --- a/tests/docker/dockerfiles/debian-ppc64-cross.docker +++ /dev/null @@ -1,11 +0,0 @@ -# -# Docker ppc64 cross-compiler target -# -# This docker target builds on the debian Buster base image. -FROM qemu/debian10 - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-powerpc64-linux-gnu \ - libc6-dev-ppc64-cross diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 11009fe433..6627318adf 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -147,18 +147,14 @@ for target in $target_list; do ;; ppc-*|ppc64abi32-*) container_hosts=x86_64 - container_image=debian-powerpc-cross - container_cross_cc=powerpc-linux-gnu-gcc + container_image=debian-powerpc-test-cross + container_cross_cc=powerpc-linux-gnu-gcc-10 ;; - ppc64-*) + ppc64-*|ppc64le-*) container_hosts=x86_64 - container_image=debian-ppc64-cross - container_cross_cc=powerpc64-linux-gnu-gcc - ;; - ppc64le-*) - container_hosts=x86_64 - container_image=debian-ppc64el-cross - container_cross_cc=powerpc64le-linux-gnu-gcc + container_image=debian-powerpc-test-cross + container_cross_cc=${target%%-*}-linux-gnu-gcc-10 + container_cross_cc=powerpc${container_cross_cc#ppc} ;; riscv64-*) container_hosts=x86_64 @@ -272,6 +268,10 @@ for target in $target_list; do -mpower8-vector -o $TMPE $TMPC; then echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak fi + if do_compiler "$target_compiler" $target_compiler_cflags \ + -mpower10 -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak + fi ;; i386-linux-user) if do_compiler "$target_compiler" $target_compiler_cflags \ From patchwork Tue May 4 10:02:20 2021 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: 430859 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3653975jao; Tue, 4 May 2021 03:21:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvCDYKoH0DCkv0CwpnxT7d7Jkj3/vzSw9l0QxAbbtUO+WY8VFKl/foXp3BWu4feJ4cUZ7K X-Received: by 2002:ab0:2441:: with SMTP id g1mr19168242uan.76.1620123672483; Tue, 04 May 2021 03:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123672; cv=none; d=google.com; s=arc-20160816; b=I6UnU/UtgOrJasGjuw49EzCUYjmBbzIMGyaUsn1eQnDQhEXNKzdr2mttqaP5CwfY+m NW9DkQIFGt49e2P5itdHvEGsY3BCP8wvS/yL+H+h9JbbCeA7SVhw+gtECkOQguN0zLsJ j1Fn/n0M/LQc7YhlkFZ6hTOoLK9ozDLopBRhhCIs1mJsT9Rr+Yze/ndblqykspPYJAJk 5Jt/YHnZOV/vPByiZ/jNNRxiF+W+uZHqmA9M5wF5AQNF/PfyVLwXNucAayv5S0A0vEFZ a44Xcx2XDF9NivFipkBMUBIYkgZGrTBI/N8tfnmuWkxMAJQYzctnfVW2mmRLlSN9TBNO VNuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=7Itxy1UuOFf0gEK0SQVLvvq83zvWvNXRtoyv+3j/ePs=; b=vFopOSqxmtI4vN456DjlA5ciraydNQIkgYoiec2LoVV6GoCrdc9t2hqd6V1O6xLozE YxxhB+xIUVECfi24+ZYnl/8Ze2s3t87UdZzJknWbvO6HbPWJK51VpWgJsdDB6TsxrcMB 3Yi5w783wsgwUIUFNjmQ9EojGL7T0B7Si1x3Qzr1h6P64m30WZdM9VMcHhkcET7in4iA Rv0W+IQ7vCp/BMu7uXh/16jZyeGG/FGTn3rNWSZVJeoek3l1dcGf5vCjfV5J/iNpa/v+ I0yT6vj2sHnG7ubjX/FgD/xGV3cTgCUShr7M9u8bEmtpvzaPeRUQUDbhnReHSrrRVVV5 5adw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AXd7kgK0; 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=fail (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 r2si7185663vsj.320.2021.05.04.03.21.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:21:12 -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=fail header.i=@linaro.org header.s=google header.b=AXd7kgK0; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldsAx-0008Cx-T4 for patch@linaro.org; Tue, 04 May 2021 06:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzq-0002Wy-Rw for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:44 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzm-0006n2-KX for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:42 -0400 Received: by mail-wm1-x32d.google.com with SMTP id o127so894230wmo.4 for ; Tue, 04 May 2021 03:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7Itxy1UuOFf0gEK0SQVLvvq83zvWvNXRtoyv+3j/ePs=; b=AXd7kgK0YzZVDR7sz42FfynpiVDCoP/liwlnrHIUPFtKiuJ7EpQC7rfIVJF8eHr+Sb rq9L7WxnUHu6nBlZVhX/MZPOLb1aIYPZBgLdE2YhtB18BG38sVPrQd+M3HTofdXGgtJZ 2Np3pzeGDYN6EfoP7Wg7wHdqB3Q8JvQWye1n1bfkWm+m44Hs1RDDXbsU5byNT1gd4+uf huiYm9fu1VwRC/PKwV4So/+b0q0zXgixqZJl59Sue92Dg00IKjRIw8d/tHKuVydozvgJ rIDNMVyzMhJZknb2W9Aae9xARxfIusdPUaTPfFv6k6BONIbyMxqwJ7Z9fWfWZnWpMeFy avpg== 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:mime-version:content-transfer-encoding; bh=7Itxy1UuOFf0gEK0SQVLvvq83zvWvNXRtoyv+3j/ePs=; b=o5hBHzQvHPs2GFxuJh/IDkWa0NZy8sqdiVyT2jgTRn5dIbstVNd/5tXEb+yRzGSqnT L6ryo/Fyl69XZC3L43wggcc6t38XF+/x3zwVJtfKggg+LYRTW6sbgidMZPmi9KDHaMPe GKOmA6l1F8M5zBk7wwR+a0aegGuy8XH89wqymZgk+au9hNyAgH0fSipFpjeNY9azEd85 RI6GBTmLPM7fD+SyGhmtdN0WfUQbiNpktpzivLrvLjFzU/4JIdDu1JORSMqoi0IIAo5K HAQQOcS34rNHCLFl/Ik7MDSoPF68ujmEB0Ca7zAnEgy/jE4OYznRQpoZwr73borvMboi 7peg== X-Gm-Message-State: AOAM531+yqr/XViPBVwm2vFJgMdTXhRmeFjgpI49qvnZXGvvEiehvDCX JmSCTkIv7jkKWSBdt9Ff1ON2Sg== X-Received: by 2002:a05:600c:22c9:: with SMTP id 9mr26488061wmg.85.1620122976362; Tue, 04 May 2021 03:09:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z6sm2171882wmf.9.2021.05.04.03.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7F1981FFB3; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 27/30] tests/tcg/ppc64le: tests for brh/brw/brd Date: Tue, 4 May 2021 11:02:20 +0100 Message-Id: <20210504100223.25427-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Fabiano Rosas , =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Matheus Ferst , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Matheus Ferst Tests for Byte-Reverse Halfword, Word and Doubleword Signed-off-by: Matheus Ferst Tested-by: Fabiano Rosas [AJB: tweak to make rules for skip/plugins] Signed-off-by: Alex Bennée Message-Id: <20210423205757.1752480-3-matheus.ferst@eldorado.org.br> --- tests/tcg/ppc64le/byte_reverse.c | 21 +++++++++++++++++++++ tests/tcg/ppc64/Makefile.target | 13 +++++++++++++ tests/tcg/ppc64le/Makefile.target | 13 +++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 tests/tcg/ppc64le/byte_reverse.c -- 2.20.1 diff --git a/tests/tcg/ppc64le/byte_reverse.c b/tests/tcg/ppc64le/byte_reverse.c new file mode 100644 index 0000000000..53b76fc2e2 --- /dev/null +++ b/tests/tcg/ppc64le/byte_reverse.c @@ -0,0 +1,21 @@ +#include + +int main(void) +{ + unsigned long var; + + var = 0xFEDCBA9876543210; + asm("brh %0, %0" : "+r"(var)); + assert(var == 0xDCFE98BA54761032); + + var = 0xFEDCBA9876543210; + asm("brw %0, %0" : "+r"(var)); + assert(var == 0x98BADCFE10325476); + + var = 0xFEDCBA9876543210; + asm("brd %0, %0" : "+r"(var)); + assert(var == 0x1032547698BADCFE); + + return 0; +} + diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target index 0c6a4585fc..a6a4ddaeca 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -10,4 +10,17 @@ PPC64_TESTS=bcdsub endif bcdsub: CFLAGS += -mpower8-vector +PPC64_TESTS += byte_reverse +ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +run-byte_reverse: QEMU_OPTS+=-cpu POWER10 +run-plugin-byte_reverse-with-%: QEMU_OPTS+=-cpu POWER10 +else +byte_reverse: + $(call skip-test, "BUILD of $@", "missing compiler support") +run-byte_reverse: + $(call skip-test, "RUN of byte_reverse", "not built") +run-plugin-byte_reverse-with-%: + $(call skip-test, "RUN of byte_reverse ($*)", "not built") +endif + TESTS += $(PPC64_TESTS) diff --git a/tests/tcg/ppc64le/Makefile.target b/tests/tcg/ppc64le/Makefile.target index 1acfcff94a..c0c14ffbad 100644 --- a/tests/tcg/ppc64le/Makefile.target +++ b/tests/tcg/ppc64le/Makefile.target @@ -9,4 +9,17 @@ PPC64LE_TESTS=bcdsub endif bcdsub: CFLAGS += -mpower8-vector +PPC64LE_TESTS += byte_reverse +ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +run-byte_reverse: QEMU_OPTS+=-cpu POWER10 +run-plugin-byte_reverse-with-%: QEMU_OPTS+=-cpu POWER10 +else +byte_reverse: + $(call skip-test, "BUILD of $@", "missing compiler support") +run-byte_reverse: + $(call skip-test, "RUN of byte_reverse", "not built") +run-plugin-byte_reverse-with-%: + $(call skip-test, "RUN of byte_reverse ($*)", "not built") +endif + TESTS += $(PPC64LE_TESTS) From patchwork Tue May 4 10:02:21 2021 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: 430840 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3648223jao; Tue, 4 May 2021 03:12:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyI/uJPOJNvHOpovxxaiBQypDh8Rygh8s5kfeF8vXe/H+hDU4mqwMz0iqUR6gNXVxHBmRu X-Received: by 2002:a05:6102:7c1:: with SMTP id y1mr20677597vsg.34.1620123147603; Tue, 04 May 2021 03:12:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123147; cv=none; d=google.com; s=arc-20160816; b=NKyVqNIKWJBJzHY3OZ/hlzsr5c+R9lyDhx0lYoQWGM7XmCa+rzoPFyI1De3cGDgz5F btuLx5qJqfvH8cKhX0divmDBqyEElry1yJ0Ms/T6CYpe44vgsn3MWAJNVN/FfZdkNqJk xVvNayEHXNrbUcqc5jnGBII/zhW+FQSoHDDEdj+8roK1K/r43Q56nq05yW6cA5P6TJgM aVQOh3xIcLiANm+8L5f+YRBbgcJKyc9GRzlZ/7YQswhVLLLAnoUdoQ0nutamoIOhJzgz zwuMnqR83y45B2Og57ssswypjn4sRRuWOzp67lewrs1BPSoAtWhkGTeX9saBx/af9I+A xX+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=B/1r7PR/C5kPfLyXXkdUvTNVaZZQrwDzdLKu6YqyjOU=; b=dj+MywnP2SkAWC+Mnikhk9/EwMISlZaM4ThcKwT8YVvJrY6dYZrSwF1D48VkEllfoj uQr1oM0/ZFIu5tKGNW4XCppdpK+d8XwgJdUVcJvHisnyDX5gBf+FpWQU5A9psQzTlW94 VfLNFO8Hke/RYRYyigwdLydDgQLZGDHJlPAG7JPWGOPRxtUcqDEIbhXaK5rQJgk1lsdi H2MD81MPzwlpH4rhdYgyCdm443olZh5o4hDpdqRyOzd0qDEG0HmLVynVKB3+FzkMG02p BGE25N1P5OlwO92HTrt71y5ZJ9uBNwKoAd+rUQaUubwGAiyDRwRZSUaDLPEEPAK5FzWM lseA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ncfGJTUO; 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=fail (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 l25si7065287vsj.349.2021.05.04.03.12.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:12:27 -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=fail header.i=@linaro.org header.s=google header.b=ncfGJTUO; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds2U-0005RS-Tl for patch@linaro.org; Tue, 04 May 2021 06:12:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzd-0002Qa-IL for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:29 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzZ-0006ip-Q5 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:29 -0400 Received: by mail-wr1-x430.google.com with SMTP id h4so8698972wrt.12 for ; Tue, 04 May 2021 03:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B/1r7PR/C5kPfLyXXkdUvTNVaZZQrwDzdLKu6YqyjOU=; b=ncfGJTUOxIibH+C5d+AixBXq8PRrM8A9OJXuZ++f8BRpkj/778FmlilCLunCglufQd kt8psQJkCyu0mvGquQ7zyOoqFcUoZdZK19K9gpI3DYrraD+E0BMsbORlO2QO91q9oae+ kltKbui72P513VZV/hRFerUN3RHFv9IdEhA742Dzhb1qs7pI4eE+TeNjUfmqhvRIs/Ur gwMiF7gv3QUByzfY4g1NIXYBl0xCpf0w5fuE1OOnxl9gaGFmZm7OvqL38XFU7aorh1Nd k+4DYgw9cIxkYSriq1KbUMstRZCq0U6NV/S3aBqkzBgrkFZQyocu2gB7aoZGFzsSZrSv aTyA== 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:mime-version:content-transfer-encoding; bh=B/1r7PR/C5kPfLyXXkdUvTNVaZZQrwDzdLKu6YqyjOU=; b=Fem46RM36cV9FfTcGxjhyZn+Pm/EVpqNJgkw+/e5NBxYDGivXCA6m66n/7jZREYwnA PYMmj/XuKgqebksVdX5cs4feluFDDsmqQvSOukUFd/3QHyNa7Mky3wZ8q2xEhIfwgJoF Nr451jWeQfI8Wneq2YExF4Qp4PkPlocYWalRBf06JzUycJ26yIXPhjARs8ZlFxycJp+K 32B+wFN/gU2wlMscjyP0d6XVQCgPWlrNuRIHAfWbB3cJVAq0gGLIWRxlnL5VtR06Jbo8 B5Qjsj86PGRMif7sjTlhk0pORbPKz0oXhf5M92qMH81YVDkX/yVZCYayyO7sip82Usm8 XlxA== X-Gm-Message-State: AOAM532OW+acbrjK96Na4nS+SS18VhWlYWjR4eJmIlYVdcQ2DGZufl8d 3xFpyKj9SFmE+gyPIIhdP5xiwg== X-Received: by 2002:a5d:528a:: with SMTP id c10mr30809646wrv.333.1620122964143; Tue, 04 May 2021 03:09:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b10sm2040813wrr.27.2021.05.04.03.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B38C1FFB4; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 28/30] tests/tcg: add a multiarch signals test to stress test signal delivery Date: Tue, 4 May 2021 11:02:21 +0100 Message-Id: <20210504100223.25427-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds a simple signal test that combines the POSIX timer_create with signal delivery across multiple threads. The aim is to provide a bit more of a stress test to flush out signal handling issues for easily than the occasional random crash we sometimes see in linux-test or threadcount. Signed-off-by: Alex Bennée --- v2 - minor cosmetic tweaks - skip for alpha/sparc64 (including with plugins) --- tests/tcg/multiarch/signals.c | 149 ++++++++++++++++++++++++++++ tests/tcg/alpha/Makefile.target | 7 ++ tests/tcg/multiarch/Makefile.target | 2 + tests/tcg/sparc64/Makefile.target | 7 ++ 4 files changed, 165 insertions(+) create mode 100644 tests/tcg/multiarch/signals.c -- 2.20.1 diff --git a/tests/tcg/multiarch/signals.c b/tests/tcg/multiarch/signals.c new file mode 100644 index 0000000000..998c8fdefd --- /dev/null +++ b/tests/tcg/multiarch/signals.c @@ -0,0 +1,149 @@ +/* + * linux-user signal handling tests. + * + * Copyright (c) 2021 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void error1(const char *filename, int line, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "%s:%d: ", filename, line); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(1); +} + +static int __chk_error(const char *filename, int line, int ret) +{ + if (ret < 0) { + error1(filename, line, "%m (ret=%d, errno=%d/%s)", + ret, errno, strerror(errno)); + } + return ret; +} + +#define error(fmt, ...) error1(__FILE__, __LINE__, fmt, ## __VA_ARGS__) + +#define chk_error(ret) __chk_error(__FILE__, __LINE__, (ret)) + +/* + * Thread handling + */ +typedef struct ThreadJob ThreadJob; + +struct ThreadJob { + int number; + int sleep; + int count; +}; + +static pthread_t *threads; +static int max_threads = 10; +__thread int signal_count; +int total_signal_count; + +static void *background_thread_func(void *arg) +{ + ThreadJob *job = (ThreadJob *) arg; + + printf("thread%d: started\n", job->number); + while (total_signal_count < job->count) { + usleep(job->sleep); + } + printf("thread%d: saw %d alarms from %d\n", job->number, + signal_count, total_signal_count); + return NULL; +} + +static void spawn_threads(void) +{ + int i; + threads = calloc(sizeof(pthread_t), max_threads); + + for (i = 0; i < max_threads; i++) { + ThreadJob *job = calloc(sizeof(ThreadJob), 1); + job->number = i; + job->sleep = i * 1000; + job->count = i * 100; + pthread_create(threads + i, NULL, background_thread_func, job); + } +} + +static void close_threads(void) +{ + int i; + for (i = 0; i < max_threads; i++) { + pthread_join(threads[i], NULL); + } + free(threads); + threads = NULL; +} + +static void sig_alarm(int sig, siginfo_t *info, void *puc) +{ + if (sig != SIGRTMIN) { + error("unexpected signal"); + } + signal_count++; + __atomic_fetch_add(&total_signal_count, 1, __ATOMIC_SEQ_CST); +} + +static void test_signals(void) +{ + struct sigaction act; + struct itimerspec it; + timer_t tid; + struct sigevent sev; + + /* Set up SIG handler */ + act.sa_sigaction = sig_alarm; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_SIGINFO; + chk_error(sigaction(SIGRTMIN, &act, NULL)); + + /* Create POSIX timer */ + sev.sigev_notify = SIGEV_SIGNAL; + sev.sigev_signo = SIGRTMIN; + sev.sigev_value.sival_ptr = &tid; + chk_error(timer_create(CLOCK_REALTIME, &sev, &tid)); + + it.it_interval.tv_sec = 0; + it.it_interval.tv_nsec = 1000000; + it.it_value.tv_sec = 0; + it.it_value.tv_nsec = 1000000; + chk_error(timer_settime(tid, 0, &it, NULL)); + + spawn_threads(); + + do { + usleep(1000); + } while (total_signal_count < 2000); + + printf("shutting down after: %d signals\n", total_signal_count); + + close_threads(); + + chk_error(timer_delete(tid)); +} + +int main(int argc, char **argv) +{ + test_signals(); + return 0; +} diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target index a585080328..49ce5cd69f 100644 --- a/tests/tcg/alpha/Makefile.target +++ b/tests/tcg/alpha/Makefile.target @@ -14,5 +14,12 @@ test-cmov: test-cond.c run-test-cmov: test-cmov +# currently broken: executes a halt on sigreturn leading to being terminated by signal SIGILL (Illegal instruction) +run-signals: signals + $(call skip-test, $<, "BROKEN") + +run-plugin-signals-with-%: signals + $(call skip-test, $<, "BROKEN") + # On Alpha Linux only supports 8k pages EXTRA_RUNS+=run-test-mmap-8192 diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index a3a751723d..3f283eabe6 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -30,6 +30,8 @@ testthread: LDFLAGS+=-lpthread threadcount: LDFLAGS+=-lpthread +signals: LDFLAGS+=-lrt -lpthread + # We define the runner for test-mmap after the individual # architectures have defined their supported pages sizes. If no # additional page sizes are defined we only run the default test. diff --git a/tests/tcg/sparc64/Makefile.target b/tests/tcg/sparc64/Makefile.target index 5bd7f90583..fb3825b7fa 100644 --- a/tests/tcg/sparc64/Makefile.target +++ b/tests/tcg/sparc64/Makefile.target @@ -7,5 +7,12 @@ run-linux-test: linux-test $(call skip-test, $<, "BROKEN") +# currently broken: hangs after the first thread exits +run-signals: signals + $(call skip-test, $<, "BROKEN") + +run-plugin-signals-with-%: signals + $(call skip-test, $<, "BROKEN") + # On Sparc64 Linux support 8k pages EXTRA_RUNS+=run-test-mmap-8192 From patchwork Tue May 4 10:02:22 2021 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: 430847 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3652636jao; Tue, 4 May 2021 03:18:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8fpbImdRiDkZAjINeJqJ2oCHa+gmB4L0G2pPbKWLJfqYDZoslxVR5F7pZSr3OJgvPCw/q X-Received: by 2002:a9f:25ab:: with SMTP id 40mr19321947uaf.141.1620123533304; Tue, 04 May 2021 03:18:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123533; cv=none; d=google.com; s=arc-20160816; b=sTilN5/XRyE1byTltITsamu2nu6wzIU3pGUFWHbU3K1grRcgVPDyQvpq5udammCDZs Xj6vWspDH521FYXbHBlCqi2lt/rDJaf5L2cb2RkNfkcFYHHUmCDiTg7pkUnSAhDKe/4C XQoiGo5+9Xcnwc6L5NpFNPOvjCtAuVewLJ0y+MY2HrFbj/un/st0R/yhLREttyFhYwWt 3y6/9bFQi8IBxosq8uiirq9joZKadwabDqCqQxcb6zAj3TGYUBDQ64Rx9f8EekhrvWZs EgGK6aUcYg93z0V5OI6PGNMditGAeWzG1H8YYm/9rg+c2jP/ftmQpiaeDx2J3YUH5TSf X2+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=5Fgd5AuHBvzHDNyp+2NAevLOgBMdJOfM03jnWADviJw=; b=Dpd7lq7b8uGq+YJX6SvtF9kqu5EoG2D1YtqyljYIHuIu7t0LzfVKw0gmNC8p2BP7nR RBpDuGjoNTKQ7xVOeV2gA5wQ/fYomahOfCURf1Wm03b/i6GyhQ1BQr6XDDKzIB6lbOMC HzVtnuhrxpAeeTX9kcekS0yk6fwPoq6ZZYAZQ0QRkL81UfhAGVoPLAYaFyH5V8FL8WCG u8CPdu4Sm/VoZa+Pj5ZeayydkppyfCf8FZ348TTDZGADKxzQK94dR1nYioI3gQp1oYAl mz7JtDrggNzgiKoNZSxshygmoQxFdw4kYdRICe+syEhJ1YI0j0py2NPeh6NU6dqFI7X3 cx3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MgUko09X; 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=fail (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 f8si6237526vkm.23.2021.05.04.03.18.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:18:53 -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=fail header.i=@linaro.org header.s=google header.b=MgUko09X; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds8i-0004gR-KT for patch@linaro.org; Tue, 04 May 2021 06:18:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzm-0002Uh-SH for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:39 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzi-0006m8-Rx for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:36 -0400 Received: by mail-wr1-x42a.google.com with SMTP id d4so8734359wru.7 for ; Tue, 04 May 2021 03:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5Fgd5AuHBvzHDNyp+2NAevLOgBMdJOfM03jnWADviJw=; b=MgUko09XnAkL7cAS59TsHU5UyW1zBzKH0CrL7B0WV1IWHdumUeyneYYCKbdtth235I Zaei3PG/yp42YROwaxHs1xHrvJVdnN4YLU8VFld8kmUsL6qKo7EnQyzVJLIXndvNVSVQ pBMY8qTHcrlNJuRsA9scUk9/74aXs25zmiFHQkBTDdijhX0f8Jm+J6KIkIQYbGDVVYYt uCRtksHZ+T9MLHnkohbP6MMkKT1YoqNHx52shQMcRIIKuYKYAdPMxgiP0XA5cLpK6vdt 9yrW1vFkMw0vVi4P+zGXBIFkx0FKhKRrAokcMPtJuehXjPAtYeOSV+surOk97V/lhumJ FUcw== 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:mime-version:content-transfer-encoding; bh=5Fgd5AuHBvzHDNyp+2NAevLOgBMdJOfM03jnWADviJw=; b=EM3nSz/CVpHau4eI90Kk+h+MPqf+8XderDuDp9XSCqogRjGrm79vNKDecl4iGULUj/ mG5c4r/P1lXooZ0uUEOlbXA2cO5MonoUVnELmlHGDHgGMFvWupomAGklsP6XdUC+XYiH EUSVY/DX1R/DBSL/xFqL0tYVgy+bOlX42eC3MUxavqs/SjZK7aCBZE3XO039HapjLjEW eYJBa+KqWnVNtQZfLdImpt69M/ftIqk7VvZJqR12TiCus1CU7RGbAMzFZCrRD6D+cL8F JAAvL1OGRo4ShCA2AG4baIAQ0N2IK8n2pEtEKHxwUpppKkMUfcgTN5wWfuULbvkARZT9 48rw== X-Gm-Message-State: AOAM533/KAFCXJSjlbvJ70puz07vXqgzhucansS/AFpYM4L+c0Jmrr1u x3+1kJ+/xdeXwlaXE2tfFTmyNQ== X-Received: by 2002:adf:f192:: with SMTP id h18mr29942150wro.270.1620122973577; Tue, 04 May 2021 03:09:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k11sm2164615wrm.62.2021.05.04.03.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B245D1FFB5; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 29/30] cirrus.yml: Fix the MSYS2 task Date: Tue, 4 May 2021 11:02:22 +0100 Message-Id: <20210504100223.25427-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Ed Maste , Yonggang Luo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Li-Wen Hsu , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The MSYS2 task in the Cirrus-CI is currently failing with error messages like this: warning: database file for 'ucrt64' does not exist (use '-Sy' to download) :: Starting core system upgrade... there is nothing to do :: Starting full system upgrade... error: failed to prepare transaction (could not find database) Seems like it can be fixed by switching to a newer release and by refreshing the database one more time after changing the /etc/pacman.conf file. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20210427185524.281883-1-thuth@redhat.com> --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Yonggang Luo diff --git a/.cirrus.yml b/.cirrus.yml index f53c519447..f4bf49b704 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -67,7 +67,7 @@ windows_msys2_task: CIRRUS_SHELL: powershell MSYS: winsymlinks:nativestrict MSYSTEM: MINGW64 - MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-01-05/msys2-base-x86_64-20210105.sfx.exe + MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe MSYS2_FINGERPRINT: 0 MSYS2_PACKAGES: " diffutils git grep make pkg-config sed @@ -130,7 +130,7 @@ windows_msys2_task: taskkill /F /FI "MODULES eq msys-2.0.dll" tasklist C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true" - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --overwrite=*" + C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu --overwrite=*" Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))" $start_time = Get-Date From patchwork Tue May 4 10:02:23 2021 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: 430848 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3652903jao; Tue, 4 May 2021 03:19:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyevZqPsEnw1PWMUQA4VK+WNfQ602WHB05QLkQ8UHbrIV4SmsK4+NzV26Yo5hBJz5uudNd4 X-Received: by 2002:ac8:7dc2:: with SMTP id c2mr21964752qte.258.1620123560972; Tue, 04 May 2021 03:19:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620123560; cv=none; d=google.com; s=arc-20160816; b=Mq8AYhFbX1gX8ltOXIA8I+jwx4A3wmUVu+0Za7dxSd0VpwDMG0SFfer2c+/UdCa3xA xj9P9FrcaJvOyUOdC7d3u8Bhg0Xr3gwBwjVpP81oTUKzUeq+j3cugWCsWvz2ouovJCdY zY84fDSycbdrPKKoAxF1EoGSG2dBZshArbl5vRqgVfzuCh1ru+aRPgKWiDCOfJvYqmXE QDb7y2FyR6t2fXSX/EihuXz8cf+5vW+VwJYrnODgSoLvQgDEEN4DFPWrC/WuysmHN0DZ 2w7cA/5RKK6eVPEstJ25tHdyJjOKKExou24e4ZDM9Z/I8S+eZRuL/uygUKWjS3WnT0ss SENg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=stNIA9RM4jSLh1xeH6t+QvbJvkHUddlJF4eVEmZyRGU=; b=sOrGVrPH8RTm5Ty7aNoSf0Z3k90YI4Rxjy31XviyW47mCTmFwVcw5DhBqYWFfRQeez GC2jQbYp0ULj4+7rw+lMsdmqM18SNNQxYjwD8oH22kP0QmBs/B8fEzvcKGgViB/j8SzB dxf/RhVB0gBfmOvrcN2Uc/WxfHADOIQJZv/+svkNEaG0nI/ETke0RqLO2NRZeNSkRYTQ 6lT0RtVglMddbBQwbrtX46TkAR9Dyy0Dzm/L526Z9TdjTcarMH8uPV+KLr362AymUaou u3PwrnJbo4dTkutdtogm5uMwFJg0p3HM8WTsXs8Pzar9bJtJJfgz4zKU4bVkm8/Nvc3o 02aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Gp1Z4pzL; 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=fail (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 q3si10275817qvs.85.2021.05.04.03.19.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 May 2021 03:19:20 -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=fail header.i=@linaro.org header.s=google header.b=Gp1Z4pzL; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lds9A-0004PP-Bz for patch@linaro.org; Tue, 04 May 2021 06:19:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldrzk-0002U2-A0 for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:36 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:43644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldrzi-0006lT-5t for qemu-devel@nongnu.org; Tue, 04 May 2021 06:09:36 -0400 Received: by mail-wr1-x429.google.com with SMTP id x7so8727926wrw.10 for ; Tue, 04 May 2021 03:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=stNIA9RM4jSLh1xeH6t+QvbJvkHUddlJF4eVEmZyRGU=; b=Gp1Z4pzLq4MUX56IxY335f+26Q8JNVOOYvLZcHHpC118utDSCMVF7iDCLfnNT4UEuN x09uaeRa3h+nKlJnJA6p/QZRE1vSTUR41wEZA7PZwhNEaef5E7MeOoB9elvJx/zy5ABB DDOf+Btis+truywR92tx+GS4BOMfz5SyhfW8ZJ4PBYV6GBg43f3TYDSXQ0sYbk1m7vgQ egUweBYuHITPWGYmOEkTCjqiiRHmArzdVZ2Q+A6b4afr2+wvxWRfoOGZrWzN4l9mjvxL os07LTy2WyTLE3lWocNEcaEwgD9jmBF40XXCeDeJqW4HlXL+6+oaMVsdPZ8nu6Qlbc04 KZ7Q== 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:mime-version:content-transfer-encoding; bh=stNIA9RM4jSLh1xeH6t+QvbJvkHUddlJF4eVEmZyRGU=; b=uACuiyLoC3akXzFU8VoHMMtoX+eUoXPSKiwa4iAzQco76cTHcxb2PK6WR/zWKiD/MN a1F4qqs70tVOhpnZmcq3X1o/xif8lg3MmETqxL4CefcgaBKMXH5AUm3x7/LoYFEZi/re IXyeSJk9MueiHpFMyBqAomVF2lRkJyZuNrK2utV96Km1GxUoCl+LjSPcy/XxCEZzXM0N /WEsU5te4Z2mVnsbsDklcTfWpnOuqy+1RDxuU/l5vKvpfwYj2X6xEXE5xewM6EjvDKKY JTj8FfilEtOoXkTkc0zw7qoVVJnJzjcUu44dkgoOgQR6x40/YHYBgpYpqElQ1AZidvQt lWYg== X-Gm-Message-State: AOAM530VbBwFlcqjpvSHfM4FCTXFPs1M2/u2O768yIOxpHAPz5SoVut7 GWfXD74+cA0ADxUE2CYti9jFSg== X-Received: by 2002:a5d:4145:: with SMTP id c5mr30668882wrq.252.1620122972703; Tue, 04 May 2021 03:09:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o62sm2386538wmo.3.2021.05.04.03.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 03:09:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C79B61FFB7; Tue, 4 May 2021 11:02:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 30/30] configure: use cc, not host_cc to set cross_cc for build arch Date: Tue, 4 May 2021 11:02:23 +0100 Message-Id: <20210504100223.25427-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org> References: <20210504100223.25427-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Otherwise you run into hilarity like trying when cross compiling a 32 bit ARM build on a 64 bit system trying to use host_cc to build 32 bit test cases. Signed-off-by: Alex Bennée --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/configure b/configure index bb86c72479..aef53cd8bb 100755 --- a/configure +++ b/configure @@ -1648,7 +1648,7 @@ case "$cpu" in # No special flags required for other host CPUs esac -eval "cross_cc_${cpu}=\$host_cc" +eval "cross_cc_${cpu}=\$cc" cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS"