From patchwork Fri Feb 25 17:20:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545903 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp505342imf; Fri, 25 Feb 2022 09:41:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJx1uGtlysA8iYh4eHulIwIvncx9iL8qwbsS2hTEvImtlthOvD7vxQew8YT4jQJauLYwpm/D X-Received: by 2002:a25:68c5:0:b0:61d:9406:48c0 with SMTP id d188-20020a2568c5000000b0061d940648c0mr8564338ybc.122.1645810892955; Fri, 25 Feb 2022 09:41:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645810892; cv=none; d=google.com; s=arc-20160816; b=qWezUu60QCmBQOsTRfFJmMqTVK1QBTIAbQbsAGhIUBrdYWh0EqHBdtMhy29/xNNauZ buzkSkGcARO5y3n9Y2rn/D0tpPoWx6EQRCdwqaAuucVsGsjgb0+hmaEcIQ6DJcMXgXtg HoCDLv2KW3XKO92CgfYhjD9pzICSZk1Veo2hRiiYZpydwGLWrO1TsPCqnzvPHJkxyMkq osKgmbxJ55crNK94jqxRAVK4VXv5UOzukzcdEXF9fdWp5H+XTHXrSWR0afv+13BUTmiu 7y4sji7gtnTeiqU08YZWlv2qh+vnNDZiy6NPIyI0+ezasDBTe9P7KCGdK67bILpi/wyG oOzg== 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=v71m4fmS0F91ZsaDPV4GFfE4X3gNbp87d+UfrwfWQJI=; b=MShdjtwtMcu+4K0KI3hrl8QjXPfhSGdT6Jbc+ICBrAkg49kV13GmN8HnZ16veIW3OC atZKVPyyOto4isnVjpE+XiCiyvQkeJCCYkl7QGq3DJ3elWICHJFchcqj1wF6Hck1anIT KyiElWeQHXZho6Xd2o1WMiosHLGrtWbFf0KfqD3Rh27swNlvZzXnSShcVcv32mUyvuVd DXMDID4ouM/bILOfGhJOVHm6LrWyNmePel23tb/gzbH2lcvFAX4Ld2E9mupLoHZCldwD aCxsbGUfdmoIEwG6lmHMSB6/MLxNizfygs9efLlEJELdWkI7LaMHXt7tOdVU3tdskTUM sOxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hMTBUWlI; 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 f4-20020a253804000000b00624758467e7si2463557yba.215.2022.02.25.09.41.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:41:32 -0800 (PST) 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=hMTBUWlI; 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]:37702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeay-0003sU-E5 for patch@linaro.org; Fri, 25 Feb 2022 12:41:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGo-0003wu-3q for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:42 -0500 Received: from [2a00:1450:4864:20::533] (port=35684 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGg-0002LZ-4n for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:41 -0500 Received: by mail-ed1-x533.google.com with SMTP id bq11so8374743edb.2 for ; Fri, 25 Feb 2022 09:20:32 -0800 (PST) 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=v71m4fmS0F91ZsaDPV4GFfE4X3gNbp87d+UfrwfWQJI=; b=hMTBUWlI/+e8YIGom2CUyzDQUkKvTc+pradEPmyxzFm6+PwsQCqkEQfG7xRYZluANc 8zgLR/Xou3GwYYL6U3AxSAJo17gpvtc6zeVZVOrY6xlx2on+6Kew5916aWq8vsKElMZV gnRDW8BIkfmmoIe2i69Brt5/qb9adFcqQHYeKls7+0M1AFXIOTC/YLVfucP2kj+1R6qL 4lUm09WDMKsRCk27EAE0mf8v4CHK8rx8QF5tcDDwDcN2qxiRaue3ZnD6xglHrLjT/V1s hYbhVbXUEWWLy2se4miSkKeY3mT1v3HNZ0Js3MOr7ytWrDZOG4fwCMi5YMYR8rFpOq/q jNDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v71m4fmS0F91ZsaDPV4GFfE4X3gNbp87d+UfrwfWQJI=; b=ojxqVo3lyujuA5+Tnsd6nfcgVi1JvaNtVMG6oJ9GJ+ZIbg7lseyxwh+CwMgYcOAvI4 +gUGhyM60Kg/wXUTBzv8TEviFpVr6WllqabCvkaIB7dZ6cCbN+32qdIjeiWoVWrVlGDf +e5OS3a9JsclydKlgCGqwC4W6hH5hmj3SxVBb921uZwXWDvP8RBmws98KAtM0hU4aWbR c6uRMZ58ch3n3NIS1WSrSkiQ3GQzCWhl2L8uDNe+l4anUcC0AT3zlCsXDTYNBvomXsKG tu5j/i+ux3r1NBS/monNFqmIWWGHs5++b0dzSfhDFfWmtj82mbzAsgNvqLv7oELnSyc9 TXoA== X-Gm-Message-State: AOAM530t6avSARLmQG6gHsc92aV6J+tShY0tb2QDlJEZ7wXRFrdj5yct t6HQdZh5DbbvfUk4+225RoCY8w== X-Received: by 2002:a05:6402:1341:b0:407:cece:49f8 with SMTP id y1-20020a056402134100b00407cece49f8mr7981811edw.152.1645809631009; Fri, 25 Feb 2022 09:20:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h12-20020a056402280c00b00412ca9508b7sm1667727ede.17.2022.02.25.09.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 13F531FFB8; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/18] tests/docker: restore TESTS/IMAGES filtering Date: Fri, 25 Feb 2022 17:20:04 +0000 Message-Id: <20220225172021.3493923-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , Alex Williamson , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This was broken in the re-factor: e86c9a64f4 ("tests/docker/Makefile.include: add a generic docker-run target") Rather than unwind the changes just apply the filters to the total set of available images and tests. That way we don't inadvertently build images only not to use them later. Signed-off-by: Alex Bennée Reported-by: Alex Williamson Message-Id: <20220211160309.335014-2-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/docker/Makefile.include | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f1a0c5db7a..0ec59b2193 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -8,13 +8,19 @@ COMMA := , HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) +# These variables can be set by the user to limit the set of docker +# images and tests to a more restricted subset +TESTS ?= % +IMAGES ?= % + DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian10 debian11 # we don't directly build virtual images (they are used to build other images) DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain empty -DOCKER_IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +__IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_IMAGES := $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__IMAGES)) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache @@ -23,16 +29,14 @@ DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) -DOCKER_TESTS := $(notdir $(shell \ - find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) +__TESTS := $(notdir $(shell \ + find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) +DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS)) ENGINE := auto DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) -TESTS ?= % -IMAGES ?= % - CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) @@ -274,8 +278,8 @@ endif @echo ' TARGET_LIST=a,b,c Override target list in builds.' @echo ' EXTRA_CONFIGURE_OPTS="..."' @echo ' Extra configure options.' - @echo ' IMAGES="a b c ..": Filters which images to build or run.' - @echo ' TESTS="x y z .." Filters which tests to run (for docker-test).' + @echo ' IMAGES="a b c ..": Restrict available images to subset.' + @echo ' TESTS="x y z .." Restrict available tests to subset.' @echo ' J=[0..9]* Overrides the -jN parameter for make commands' @echo ' (default is 1)' @echo ' DEBUG=1 Stop and drop to shell in the created container' From patchwork Fri Feb 25 17:20:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545901 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp502255imf; Fri, 25 Feb 2022 09:37:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzOhpYXEwoE4ITePXn8YtknxBUqUVNgIjwCtdl6t6DHxMA/fgIdBzgUFsqAjQHM/JFpIyyF X-Received: by 2002:ad4:53c5:0:b0:429:d6fb:f0a0 with SMTP id k5-20020ad453c5000000b00429d6fbf0a0mr6659591qvv.108.1645810649765; Fri, 25 Feb 2022 09:37:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645810649; cv=none; d=google.com; s=arc-20160816; b=VeN4WFT4vmRlZ17bqAU/vZ58etcHXU8pUpzVcnBU/023MDoxnEiQM/ob5ZspXwUheG wvI/dE++mcnMZFLTW7VvFTv/cSjlK0WqgR+7MfUxm0xxWWjnfL+17NUCigK19Nmm8nix c0HY5bJKD39OUVTwI+UlHVMI27Shdzz+0hsBHHHdYsq25BtpBvrVnbVAUXWTpv6zRi+k TLARpT+zEZEdc5JwWThuWTX1Zz2cZwe4GE6NvncYw+iYVV7ygib5Ty4LB1hJhef+d07S 2lNVsQhoocCkbWzFKBV0diaQPpOnkxXcIVga0mDXojqKVCKUNk8Aer4YRX01TWNUfr0q 5jGA== 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=QXNfbz2XZ5OFaFMg/qr31EDMsEF38U9zMgzcWghwuX0=; b=Lda7vnDEGxciKjbnhkSooODbJWSTSCf12bll41ejqhWH6F4UWs3kjwspnjcRUrfiQa RsTZzYXn4frsmAZ3SsL3B1t3BxUVaPekmKofJxaypVgsIkN6MZ49/8CCe4eniy9lPcs0 eSxMzsB38vN7rT5z2wwGNw6VW+YtwsdHyX25kUnh7xtTonfre3W3SCeHeMIFwXnGxq2F /8ZV6TTdZQC/f1jXcBfRbw7FB953c1oysNwxKEWteJA/QCkW2PljJQbAxJOo/cqwhFJg u/3v0LsBhNYrW49Hs/o2Ta0F9XMoZFIDJMAFLpSdMMYc+uvPyTrnkHHkYb9Xz4dLsL/A ftRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="H/sJvpOL"; 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 f15-20020a05622a1a0f00b002de2de400b4si2230264qtb.442.2022.02.25.09.37.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:37:29 -0800 (PST) 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="H/sJvpOL"; 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]:57542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeX2-0006rB-BO for patch@linaro.org; Fri, 25 Feb 2022 12:37:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGk-0003mZ-FT for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:38 -0500 Received: from [2a00:1450:4864:20::62b] (port=44767 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGf-0002L0-TX for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:38 -0500 Received: by mail-ej1-x62b.google.com with SMTP id p14so12121403ejf.11 for ; Fri, 25 Feb 2022 09:20:26 -0800 (PST) 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=QXNfbz2XZ5OFaFMg/qr31EDMsEF38U9zMgzcWghwuX0=; b=H/sJvpOL/kAoUA7Zl1wwzIXkuE783dJyMDoxbnrowZ327VzL0a4HDj8tofCbzc/9vS MbzBhZGJDL/HtwT6Xnj9lWi2H5Wl6wP8VbOyIj3y9GkhFJ5uNZi+mQSwgj2lrGdSCN1Z dlxGIli3kk/SZ0Kk45FM9q2WDbklExzLC22uRLCel47tNvHBxtyadYjwznrPVicImoIh UJpJi5E+m/oTkPkFVn+QMGxGuc4wCczzKXwoi6D4f8YSA0V25yL09+voYoNM6hspP8B9 QssG5QHGprHrqM94v+uSe4/RQvpV2q9b2lgJYRlRZtyiOqdrenrhbrkHz55SxZRk3R3e gomg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QXNfbz2XZ5OFaFMg/qr31EDMsEF38U9zMgzcWghwuX0=; b=NBTdp4H4z1Z4PDzEtbvMB4eCPdBnMQ2/o+fy6NTQt0tXp+e/0auq65llKqBvL5dJtU CzS+jSjom7v5vZv/8+MzgOXOI8lpxuAnUDADphBSPNJsrPVTUSSHwIFQneg7vs4/GP+M 5OUzbRzuHDJd+7gEXc7wLAZGY4F1GtUTZVazhJqMikr/3Wtw1Qxt316xGvvPs3YcWNfN ygFNFu6On79DFiaQCH5BBMPWuDd/EA0pK5qZPR0UCphOVyI360UI0xKjUCKeQPEF7+vH j3dfCMhY6u3zm6Q6gtpZVbjqKW4RJknj913kpAfHLn/RT07ojZ/9iQDX1fkxgNcybHvb dNrg== X-Gm-Message-State: AOAM5334oeWHonfCNMgNtNDgY9FoXwtmJqnld+iKOaiP0aF0LPrIiPxA lUt1vD8sk/sLUF3YRuSGoJhh/Q== X-Received: by 2002:a17:906:181a:b0:6d0:ebf5:c064 with SMTP id v26-20020a170906181a00b006d0ebf5c064mr6662884eje.82.1645809625489; Fri, 25 Feb 2022 09:20:25 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l21-20020a056402231500b0041327b58030sm1669973eda.2.2022.02.25.09.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2ADCF1FFBA; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/18] tests/docker: add NOUSER for alpine image Date: Fri, 25 Feb 2022 17:20:05 +0000 Message-Id: <20220225172021.3493923-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The alpine image doesn't have a standard useradd binary so disable this convenience feature for it. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20220211160309.335014-3-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/docker/Makefile.include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0ec59b2193..286f0ac5b5 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -158,6 +158,9 @@ docker-image-debian-native: DOCKER_REGISTRY= docker-image-debian10: NOUSER=1 docker-image-debian11: NOUSER=1 +# alpine has no adduser +docker-image-alpine: NOUSER=1 + # # 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 From patchwork Fri Feb 25 17:20:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545918 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp530592imf; Fri, 25 Feb 2022 10:12:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJy6bQOkONxYtFm3bBfGgl8dXE3qUgIH3rSBpF5VgeqrbO2G/oZ17suBRi8brVV4BCRRc+MQ X-Received: by 2002:a05:622a:316:b0:2de:4b60:497 with SMTP id q22-20020a05622a031600b002de4b600497mr7969010qtw.224.1645812749487; Fri, 25 Feb 2022 10:12:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645812749; cv=none; d=google.com; s=arc-20160816; b=Y3J0iChggxsdZOSzvF0KqK4XHvkBT6C0gHJU8xq0yeO0Pq+v8ZT4oLypaW0/tAJ1XZ ITU7PL7ea79BKRHa0nuYCI4FVkbsXg4c5wLuY3rB6YnZEVG6cMvaznFSC2OQZKzEfqbM rYKwjFMd+Htl1M3CD8z5j55SipHlXeLrmjJ1AP/cBq+g+OSKd5RHGq5AzmyOQzsl6k40 bTiVceAJ1qw/5ESoro3R18NVgEWLoxyKpqExT8B3mKFm7J2drAhNFTT6LebbY/JwRiPm aP+F4am/orjqlPiL3Av8KKiikfv/43Urj7EF6uruGGagrvcPsj1R+NYY41HPm8bEyPxB /FZA== 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=xtrexeoEJVm2dGaopXDo69WQ4Zzi4WQEocMvz+dIqSU=; b=xtWbXOsVdruZT0C3lTpI3OyyjCURtFfnGx2ezHSjy9SQWlDxTlxfw1tJ/jhle86JRK k7r0yaHsGIBxb93ixOn+Ey2UCrdmqHUqepRZ1dYMj7CU1MnZHOJorkMeDawptelx+/e2 Li9ka/DXaCurdg9rgLnv7QN8tWcDv1m7wdUeJp9gsM3Ing6gSxl0vM0l54Rs8RZVA8Lh 5WCBSNN4dA31/R0pYQw9wC7UzweG3h5fNuRjnbXE+x9hqwWgpypaOD7haK5ADppb7jq8 78/AJy/TAzh87MZCE4OP4aexKK2BAnGTj78VgdQjcHaaOKhoV5+VH1QACXMo7b6+jlY4 JZoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AVzGVmX4; 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 t123-20020a375f81000000b0064955ac9128si1820862qkb.198.2022.02.25.10.12.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 10:12:29 -0800 (PST) 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=AVzGVmX4; 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]:55934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNf4v-0004ts-27 for patch@linaro.org; Fri, 25 Feb 2022 13:12:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeH0-00047D-O5 for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:54 -0500 Received: from [2a00:1450:4864:20::52a] (port=45990 helo=mail-ed1-x52a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGg-0002LF-66 for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:54 -0500 Received: by mail-ed1-x52a.google.com with SMTP id c6so8306475edk.12 for ; Fri, 25 Feb 2022 09:20:28 -0800 (PST) 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=xtrexeoEJVm2dGaopXDo69WQ4Zzi4WQEocMvz+dIqSU=; b=AVzGVmX4CuLohMIoFyj7XnVR5CQNfxXsA8ZgBimISvdK9NGR2ugYIwqnuWlOeH7N6P jT1JTtBKJr1GIlCFkHVG3iNN9yOzLHVElKHYjLftUr06n47VwLOY3gD99dr8eTNuTkAG QWDHww2vp6IPi5d00k4+w+xyHirtLMq71WNsA7sIw0EIefjd3xiuoTg3uLFQ3QKUiC1R mZI1flhx3Tmdk7HwVEGOy4rHoODVcag4PQHiZYxN5rAs6BnZkDfAzlIowdFGE0+l8tCV 2QKW06GV67A8xr1Q3pvrUBsziVu/aZ3RzJLoHBLDGhq0hccUMbE2qvKHqPzhxCXJvgNh qKFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xtrexeoEJVm2dGaopXDo69WQ4Zzi4WQEocMvz+dIqSU=; b=Q37dWAjzg9KS1okRhguThxHy5nTlblPN7CfSo5S6vwkVdXKeyUlTGm7wE3M9lxntwG KhJJHMBb5ECuRi7ggNjAPqJfvL0xWnkFNnRN/XqL+DVKx5abR2KrirHRBQdBDYL/8Cuf MnKy9dKtHgAQKt4Q8AvL8ODLTgSWKmlqSk31LeBH8MAKu+I4fpfJ+871QVxf6xSJZ7TY /orbtN9JweTgE7IcVcFwTitlnHbm4Djm8b4DGEuK3CKyYaWqFxvN5pU/+y/5+eMQAtzs jN55EF5D3FBmNPteAjcmwFfht26rpzbE6H7K1bTKp15eP+VQMWiXGULf4Oz1yeqryALK Tf9Q== X-Gm-Message-State: AOAM532s7kNyJqk1xmRdJzwfAwNOPFbxjIDzFL0+51++lnOpDNOt7iDp 2Fr4aEKLRcoT8js9NXF3+C9EAA== X-Received: by 2002:a05:6402:13cb:b0:410:820f:4e8 with SMTP id a11-20020a05640213cb00b00410820f04e8mr7907671edx.352.1645809627255; Fri, 25 Feb 2022 09:20:27 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u1-20020aa7d0c1000000b004132c0a9ee3sm1596730edo.84.2022.02.25.09.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3CACA1FFBB; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/18] tests/lcitool: update to latest version Date: Fri, 25 Feb 2022 17:20:06 +0000 Message-Id: <20220225172021.3493923-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We will need an update shortly for some new images. Signed-off-by: Alex Bennée Message-Id: <20220211160309.335014-4-alex.bennee@linaro.org> --- tests/docker/dockerfiles/opensuse-leap.docker | 3 +-- tests/docker/dockerfiles/ubuntu1804.docker | 3 +-- tests/docker/dockerfiles/ubuntu2004.docker | 3 +-- tests/lcitool/libvirt-ci | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 1b78d8369a..e1ad9434a3 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -127,8 +127,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 699f2dfc6a..0a622b467c 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -134,8 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 87513125b8..b9d06cb040 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -136,8 +136,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 6dd9b6fab1..f83b916d5e 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe +Subproject commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb From patchwork Fri Feb 25 17:20:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545916 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp525617imf; Fri, 25 Feb 2022 10:06:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbeLvWCNXsNtksop9lcR5+yJ6s9rlqmmQ4/ZKaVKM1WKtzxFmLNJOLXC8BHaV7p/3Px3mL X-Received: by 2002:a05:6214:260b:b0:42c:90f:2cbf with SMTP id gu11-20020a056214260b00b0042c090f2cbfmr6945187qvb.62.1645812410819; Fri, 25 Feb 2022 10:06:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645812410; cv=none; d=google.com; s=arc-20160816; b=e+cNJjzrfe/wuEo9CEcnej7fzURe/NNOz4R/3RhWbAPO9anCKFMrAcBvqnlPA9v6AN 77h88rIJ/cyb/dNPrXYeA9wA+rb7gPG1OJOIIp22jTIe/T3RPFnwF3+Suoz0zutG8dKi QqwhZCl3EfYDfNkRRyLjB87n/+NzpYz4JoKyiXnbrwUzD6c9BGRN3MmkHhEyqZfVBKYO PwCtuDDzVOJHDwOmFZFFoVCI17IN2bHePeAlNoBWsluVROPWdxakYiomlrtFmXhnrkuA 1VCwMis8Un1+1Y9imKPWMLRpJwbQONDLpxOWWnJwPiS5SbbE0mUVWEam5WwCniQYsgem /5dA== 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=ZnSDnS26O+We8tj2s8QP2w5gvYU8tgP2p7nPv2ljHq4=; b=tO7e3gqFBX0/QyAwC0bdLRHiHP1bx3oih2CZE5itLvgO4GmNM//XGKsxsopuSXaoIs bhOnl43lk8SjrGyqn4tJ9ILT6tR1LxKpv8rShLYlkKwurOHPcFhjgwzzgAghvLgXpFfH W/zjOSeg/rYuoUl5OHtgcPcNWWz9juzmE8rQmC7y5PiT+jKkVLJ/TLDoRO3IgeZyXwdh rJdaM1oHgJximdsiVNtVHD2xIK6oBcEwTKhFxCBUu7iwH+DK4386r/T9DSMfLHfcojtZ h9h7pnnmURYWavczrwiZsZZzio5kcROTIw3VY4lBDrAaUVtycbZ46Jmh+9B371jIV1gu Dc/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SoCYPLt5; 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 dv7-20020ad44ee7000000b00432df16bb96si817897qvb.227.2022.02.25.10.06.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 10:06:50 -0800 (PST) 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=SoCYPLt5; 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]:44034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNezS-00057P-8L for patch@linaro.org; Fri, 25 Feb 2022 13:06:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGl-0003oz-1v for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:39 -0500 Received: from [2a00:1450:4864:20::62f] (port=33655 helo=mail-ej1-x62f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGf-0002LO-UM for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:38 -0500 Received: by mail-ej1-x62f.google.com with SMTP id vz16so12271667ejb.0 for ; Fri, 25 Feb 2022 09:20:30 -0800 (PST) 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=ZnSDnS26O+We8tj2s8QP2w5gvYU8tgP2p7nPv2ljHq4=; b=SoCYPLt5RuWOGv4ZFpUO81SNX7L2sz67aALqZwAaO0weDpkfc9m32bCPcIAHKDAxP1 q4YU7wvdgjfWfrI5F08q7OZfo7qHFsU588MCc9JemYwtPO50ifH8QzWxxY/N7j+bDo3c 9PSyilMVaNT2F015qwzbq45QRHNRszcVO4J7meXSc5RDptZZhOVGouzTigYyDStfIMdf ysSuF7LCtQ3JtrLx2TaCdss5V0QdhoQpLp3uyYlk7sk6nM1ihCqmidKFgpejGvvluBMX RjsxZEGBKrmWGbrGfhy7EIa6xXw3ZK9fjGlAKX/wXHcBTlqnU5uiH/q8aE6D4fMXCOai I9uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZnSDnS26O+We8tj2s8QP2w5gvYU8tgP2p7nPv2ljHq4=; b=B5be8xme3jP102DNeZtLizVEpScUgEFjvq0NTl271fUuY3AdkxcHWv0eoDUKORpydF pEcwEPeUd013vjp4r9nvDcF/hFl+ap19qGV3IBCvetwHgDDvnGQrzwU828ksazABF6Qz Izplp8vDbjsDUim2ds/euUUytBFQWiMNhNO5RZwOTnw1IbROhd3cVnp3Q9Gkgg0dLUUW ak2FcoY/IOLQ3xZYSD6nUpQj6URtXpRxkBMWcnlyDPvdmYHsDUbNzdmfGi4iEUyH40/s SftqFwG6ctArho1XvhRfdFOdJnV6+5bi6aobpxyr0lyS+QV7L/WfeBmmvDGQhoFyQMs5 Q4lg== X-Gm-Message-State: AOAM532MA7PrEdO1pZgef3Uizb1StiilZpeRKUsle/YcviukAH4bT+2C bVLhGpk1oE2L41SWkRXfyHI2Nw== X-Received: by 2002:a17:906:354f:b0:6b4:1449:2d03 with SMTP id s15-20020a170906354f00b006b414492d03mr7318771eja.197.1645809629921; Fri, 25 Feb 2022 09:20:29 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z60-20020a509e42000000b00410d28fc82bsm1592557ede.19.2022.02.25.09.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 66A191FFBC; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/18] tests/docker: update debian-arm64-cross with lci-tool Date: Fri, 25 Feb 2022 17:20:07 +0000 Message-Id: <20220225172021.3493923-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Using lci-tool update debian-arm64-cross to a Debian 11 based system. As a result we can drop debian-arm64-test-cross just for building tests. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220211160309.335014-5-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 10 +- tests/docker/Makefile.include | 3 - .../dockerfiles/debian-arm64-cross.docker | 186 +++++++++++++++--- .../debian-arm64-test-cross.docker | 13 -- tests/lcitool/refresh | 11 ++ tests/tcg/configure.sh | 2 +- 6 files changed, 173 insertions(+), 52 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-arm64-test-cross.docker diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index a3b5b90552..ed620620f8 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -21,18 +21,10 @@ amd64-debian-user-cross-container: arm64-debian-cross-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-arm64-cross -arm64-test-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian11-container'] - variables: - NAME: debian-arm64-test-cross - armel-debian-cross-container: extends: .container_job_template stage: containers-layer2 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 286f0ac5b5..eeee1e6bdf 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -137,7 +137,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-alpha-cross: docker-image-debian10 -docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-armel-cross: docker-image-debian10 docker-image-debian-armhf-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 @@ -213,14 +212,12 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # Specialist build images, sometimes very limited tools 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-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 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 diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 166e24df13..589510a7be 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -1,32 +1,166 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker arm64 cross-compiler target +# $ lcitool dockerfile --layers all --cross aarch64 debian-11 qemu # -# This docker target builds on the debian Buster base image. -# -FROM qemu/debian10 +# https://gitlab.com/libvirt/libvirt-ci -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture arm64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - crossbuild-essential-arm64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a arm64 --arch-only qemu +FROM docker.io/library/debian:11-slim -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu- -ENV DEF_TARGET_LIST aarch64-softmmu,aarch64-linux-user +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + libtest-harness-perl \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:arm64 \ - liblzo2-dev:arm64 \ - librdmacm-dev:arm64 \ - libsnappy-dev:arm64 \ - libxen-dev:arm64 +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -# nettle -ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS --enable-nettle +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture arm64 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-aarch64-linux-gnu \ + gcc-aarch64-linux-gnu \ + libaio-dev:arm64 \ + libasan5:arm64 \ + libasound2-dev:arm64 \ + libattr1-dev:arm64 \ + libbpf-dev:arm64 \ + libbrlapi-dev:arm64 \ + libbz2-dev:arm64 \ + libc6-dev:arm64 \ + libcacard-dev:arm64 \ + libcap-ng-dev:arm64 \ + libcapstone-dev:arm64 \ + libcurl4-gnutls-dev:arm64 \ + libdaxctl-dev:arm64 \ + libdrm-dev:arm64 \ + libepoxy-dev:arm64 \ + libfdt-dev:arm64 \ + libffi-dev:arm64 \ + libfuse3-dev:arm64 \ + libgbm-dev:arm64 \ + libgcrypt20-dev:arm64 \ + libglib2.0-dev:arm64 \ + libglusterfs-dev:arm64 \ + libgnutls28-dev:arm64 \ + libgtk-3-dev:arm64 \ + libibumad-dev:arm64 \ + libibverbs-dev:arm64 \ + libiscsi-dev:arm64 \ + libjemalloc-dev:arm64 \ + libjpeg62-turbo-dev:arm64 \ + liblttng-ust-dev:arm64 \ + liblzo2-dev:arm64 \ + libncursesw5-dev:arm64 \ + libnfs-dev:arm64 \ + libnuma-dev:arm64 \ + libpam0g-dev:arm64 \ + libpixman-1-dev:arm64 \ + libpng-dev:arm64 \ + libpulse-dev:arm64 \ + librbd-dev:arm64 \ + librdmacm-dev:arm64 \ + libsasl2-dev:arm64 \ + libsdl2-dev:arm64 \ + libsdl2-image-dev:arm64 \ + libseccomp-dev:arm64 \ + libselinux1-dev:arm64 \ + libslirp-dev:arm64 \ + libsnappy-dev:arm64 \ + libspice-server-dev:arm64 \ + libssh-gcrypt-dev:arm64 \ + libsystemd-dev:arm64 \ + libtasn1-6-dev:arm64 \ + libubsan1:arm64 \ + libudev-dev:arm64 \ + liburing-dev:arm64 \ + libusb-1.0-0-dev:arm64 \ + libusbredirhost-dev:arm64 \ + libvdeplug-dev:arm64 \ + libvirglrenderer-dev:arm64 \ + libvte-2.91-dev:arm64 \ + libxen-dev:arm64 \ + libzstd-dev:arm64 \ + nettle-dev:arm64 \ + systemtap-sdt-dev:arm64 \ + xfslibs-dev:arm64 \ + zlib1g-dev:arm64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ +ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/aarch64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'aarch64'\n\ +cpu = 'aarch64'\n\ +endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc + +ENV ABI "aarch64-linux-gnu" +ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" +ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu- +ENV DEF_TARGET_LIST aarch64-softmmu,aarch64-linux-user diff --git a/tests/docker/dockerfiles/debian-arm64-test-cross.docker b/tests/docker/dockerfiles/debian-arm64-test-cross.docker deleted file mode 100644 index 53a9012beb..0000000000 --- a/tests/docker/dockerfiles/debian-arm64-test-cross.docker +++ /dev/null @@ -1,13 +0,0 @@ -# -# Docker arm64 cross-compiler target (tests only) -# -# This docker target builds on the debian Bullseye base image. -# -FROM qemu/debian11 - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture arm64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - crossbuild-essential-arm64 gcc-10-aarch64-linux-gnu diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 4ab90a310a..ada73f7045 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -76,6 +76,12 @@ ubuntu2004_tsanhack = [ "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n" ] +def debian_cross_build(prefix, targets): + conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix) + targets = "ENV DEF_TARGET_LIST %s\n" % (targets) + return "".join([conf, targets]) + + try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("fedora", "fedora-35") @@ -86,6 +92,11 @@ try: generate_dockerfile("opensuse-leap", "opensuse-leap-152") generate_dockerfile("alpine", "alpine-edge") + generate_dockerfile("debian-arm64-cross", "debian-11", + cross="aarch64", + trailer=debian_cross_build("aarch64-linux-gnu-", + "aarch64-softmmu,aarch64-linux-user")) + generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") generate_cirrus("macos-11") diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 763e9b6ad8..adc95d6a44 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -97,7 +97,7 @@ for target in $target_list; do aarch64-*) # We don't have any bigendian build tools so we only use this for AArch64 container_hosts="x86_64 aarch64" - container_image=debian-arm64-test-cross + container_image=debian-arm64-cross container_cross_cc=aarch64-linux-gnu-gcc-10 ;; alpha-*) From patchwork Fri Feb 25 17:20:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545917 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp528451imf; Fri, 25 Feb 2022 10:09:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9GLVn7TNxJuhVcZ6C4MvVvncc9WE/ZZ6zuRJPfbk2CO/yJq5ool1PCvGr6QMEf6b6eio7 X-Received: by 2002:a0d:cd04:0:b0:2d7:ee8e:9054 with SMTP id p4-20020a0dcd04000000b002d7ee8e9054mr8814508ywd.270.1645812596097; Fri, 25 Feb 2022 10:09:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645812596; cv=none; d=google.com; s=arc-20160816; b=Gfa5K8PVUTMH4JdHaklJFdJ7jzgzoxwRBCY29co05cOtXEORUrcmjt/u1lXzZihL/Y urChaNaY9p2G1J2aSHwKAFY284MQv2e2rlVj+3fjskixFMGVTPBShlGcavL2KkEQbjhM F649luZCU4ugb8I+FCNMj+qqu7W5gke/1N9b0WBoH6Dzet5zXF58u/khw+ayLgOEproG JHUAkW/zXTRDKQqW9C4OyuSEncvhpYLAOqvfy5SN+ChAf6toiKIr5PzftXh9QOcdMUDR pJR5MLAbFWzim0PhPDp6NMGahlYckKDNzpCvJ72VHtzq6TrytzQlRndyUpDfhs0+WFfj M8Iw== 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=+G/DDnZSSPBpxTDH5LHwmWfrZUBy0frdGXfGghtLdtU=; b=lZpAUCMTijDSFRuXX4qjQMlxtSdhkIizvYDJ9pe0BxP/pNqI/UciDdhG5Jq9ROyrUv AeR8PEHSPq7DusiFr7VWF73ZpEDkNaWoIqxdDBAYSPn9GX5bWbHu5ls3b22GYGnZ5de4 rs2wmCg2+JolHF5KwZh1tSXpQWUw5xu/Qysl410dS9jVfFiLpeVngp+dbf81ZvG2gr9O 8NNcE523tqsHXz6zcfCnIXWBveoqFzn/cDjFlspZ0kGDeS1EwXdSLQQJ8aFe+b05tW9S hCjGqPdktbugbAn4cRnrqPpDFvbWjLi0Jcvh+gUyzlzhsBBaw/0MHGOqFkaTiexoxp32 sXZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Mc+fFb7W; 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 j11-20020a25230b000000b00610adfca83bsi2421647ybj.426.2022.02.25.10.09.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 10:09:56 -0800 (PST) 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=Mc+fFb7W; 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]:50508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNf2R-00019O-Gv for patch@linaro.org; Fri, 25 Feb 2022 13:09:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGz-000448-Hx for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:53 -0500 Received: from [2a00:1450:4864:20::631] (port=45604 helo=mail-ej1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGj-0002Mk-Ti for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:47 -0500 Received: by mail-ej1-x631.google.com with SMTP id lw4so12129430ejb.12 for ; Fri, 25 Feb 2022 09:20:37 -0800 (PST) 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=+G/DDnZSSPBpxTDH5LHwmWfrZUBy0frdGXfGghtLdtU=; b=Mc+fFb7WgY1/YTufnaQlw7OY/chmMqlbAJ12F33y3rH7O0HRtylrR+cvoT9jCfH7Xu o3C3FhO+8m1rskWlHo3rzZlskwSSM/rLz7G48hVhcl1oKA9+dzgrQCnhOXQ2rNebzhtK ynFQz16Qkch7vKih347jys3lnIusFRxMKRUMi4uYnd+NhLQ8+/NvQheSbMhGlGFuYn1U oWme3ldc2UgT90ZoDPGohP/uDNaT7eGREc3KU8VnH2LY2cdaEQ1PxrmUd4A8ZLENHHD6 5ftvvwQ9Tiy/o/8uOT49Hz7nLkdCdDPjMTnUzerWHd7Tt0tshT/AQ9n4gUuVBpFyZCx7 y9DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+G/DDnZSSPBpxTDH5LHwmWfrZUBy0frdGXfGghtLdtU=; b=2TkwC6E1XtIREGZ5g959z8ukx5xu12yy/bHgfBFLm2roBijLkY2Fm1jJTBDXF7P6Ti WjHgkAHCxmp9KceID14f6bYA64LdUSRVzAKlTH6Zuqwg6/G+QTQO7qGxCLt9XS0TXcCM BKgr3APNNX8N0JKYRfK9Kk/z6so0QyT6p4gpHF0jgPp7tVrbh7LxcOrlPqYRgXcC8YHd bUOo9WU6FPANxrDt6ApSWJchET59L3F8Xc0l6h4u4hnfoNQ9/h9XamDIwkvk4NIlV/T3 Sr8z6jzZV6EARbyJHdJqQ6Cxmx1ClR/YzWJg1PH7DCKVYRWQIPhmaIyOHBaFVOrzWHHh lCBg== X-Gm-Message-State: AOAM5337VYQOcSAPlFzKazoPN9uMrCrFMIdP0GUOGLIMN6OGOUV1UMbd SJGcMO9MgXUcFBFPMiEfx3zn3Q== X-Received: by 2002:a17:907:6d28:b0:6b8:1a4f:9eff with SMTP id sa40-20020a1709076d2800b006b81a4f9effmr7091275ejc.703.1645809636255; Fri, 25 Feb 2022 09:20:36 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r7-20020a170906548700b006d4f4eccd24sm1227008ejo.77.2022.02.25.09.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7FE531FFBD; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/18] tests/docker: update debian-s390x-cross with lcitool Date: Fri, 25 Feb 2022 17:20:08 +0000 Message-Id: <20220225172021.3493923-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , David Hildenbrand , sw@weilnetz.de, Cornelia Huck , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , "open list:S390 general arch..." , qemu-arm@nongnu.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" A later compiler is needed for some upcomming tests so we might as well migrate to an lcitool generated docker file. Signed-off-by: Alex Bennée Cc: David Hildenbrand Reviewed-by: Richard Henderson --- .gitlab-ci.d/container-cross.yml | 3 +- tests/docker/Makefile.include | 1 - .../dockerfiles/debian-s390x-cross.docker | 181 +++++++++++++++--- tests/lcitool/refresh | 5 + 4 files changed, 162 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index ed620620f8..d38f657131 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -133,8 +133,7 @@ riscv64-debian-cross-container: s390x-debian-cross-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-s390x-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index eeee1e6bdf..cce9faab36 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -146,7 +146,6 @@ 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-ppc64el-cross: docker-image-debian10 -docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 9f2ab51eb0..aa1bd6eb4c 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -1,33 +1,164 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker s390 cross-compiler target +# $ lcitool dockerfile --layers all --cross s390x debian-11 qemu # -# This docker target builds on the debian Stretch base image. -# -FROM qemu/debian10 +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim -# Add the s390x architecture -RUN dpkg --add-architecture s390x +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + libtest-harness-perl \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -# Grab the updated list of packages -RUN apt update && apt dist-upgrade -yy -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-multilib-s390x-linux-gnu +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a s390x --arch-only qemu +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture s390x && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-s390x-linux-gnu \ + gcc-s390x-linux-gnu \ + libaio-dev:s390x \ + libasan5:s390x \ + libasound2-dev:s390x \ + libattr1-dev:s390x \ + libbpf-dev:s390x \ + libbrlapi-dev:s390x \ + libbz2-dev:s390x \ + libc6-dev:s390x \ + libcacard-dev:s390x \ + libcap-ng-dev:s390x \ + libcapstone-dev:s390x \ + libcurl4-gnutls-dev:s390x \ + libdaxctl-dev:s390x \ + libdrm-dev:s390x \ + libepoxy-dev:s390x \ + libfdt-dev:s390x \ + libffi-dev:s390x \ + libfuse3-dev:s390x \ + libgbm-dev:s390x \ + libgcrypt20-dev:s390x \ + libglib2.0-dev:s390x \ + libglusterfs-dev:s390x \ + libgnutls28-dev:s390x \ + libgtk-3-dev:s390x \ + libibumad-dev:s390x \ + libibverbs-dev:s390x \ + libiscsi-dev:s390x \ + libjemalloc-dev:s390x \ + libjpeg62-turbo-dev:s390x \ + liblttng-ust-dev:s390x \ + liblzo2-dev:s390x \ + libncursesw5-dev:s390x \ + libnfs-dev:s390x \ + libnuma-dev:s390x \ + libpam0g-dev:s390x \ + libpixman-1-dev:s390x \ + libpng-dev:s390x \ + libpulse-dev:s390x \ + librbd-dev:s390x \ + librdmacm-dev:s390x \ + libsasl2-dev:s390x \ + libsdl2-dev:s390x \ + libsdl2-image-dev:s390x \ + libseccomp-dev:s390x \ + libselinux1-dev:s390x \ + libslirp-dev:s390x \ + libsnappy-dev:s390x \ + libssh-gcrypt-dev:s390x \ + libsystemd-dev:s390x \ + libtasn1-6-dev:s390x \ + libubsan1:s390x \ + libudev-dev:s390x \ + liburing-dev:s390x \ + libusb-1.0-0-dev:s390x \ + libusbredirhost-dev:s390x \ + libvdeplug-dev:s390x \ + libvirglrenderer-dev:s390x \ + libvte-2.91-dev:s390x \ + libzstd-dev:s390x \ + nettle-dev:s390x \ + systemtap-sdt-dev:s390x \ + xfslibs-dev:s390x \ + zlib1g-dev:s390x && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/s390x-linux-gnu-gcc'\n\ +ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/s390x-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 's390x'\n\ +cpu = 's390x'\n\ +endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "s390x-linux-gnu" +ENV MESON_OPTS "--cross-file=s390x-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- ENV DEF_TARGET_LIST s390x-softmmu,s390x-linux-user - -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:s390x \ - liblzo2-dev:s390x \ - librdmacm-dev:s390x \ - libsnappy-dev:s390x diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ada73f7045..1f00281b44 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -97,6 +97,11 @@ try: trailer=debian_cross_build("aarch64-linux-gnu-", "aarch64-softmmu,aarch64-linux-user")) + generate_dockerfile("debian-s390x-cross", "debian-11", + cross="s390x", + trailer=debian_cross_build("s390x-linux-gnu-", + "s390x-softmmu,s390x-linux-user")) + generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") generate_cirrus("macos-11") From patchwork Fri Feb 25 17:20:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545902 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp504201imf; Fri, 25 Feb 2022 09:39:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4iJyyqWZ4eON9Xqe5khVy5CSdxTfUpbPmOXlT6NgpLZNvuzT4zJ9U9Z+vbgG4c7hsHn0W X-Received: by 2002:a81:c548:0:b0:2d2:cd8e:6851 with SMTP id o8-20020a81c548000000b002d2cd8e6851mr8411844ywj.0.1645810799183; Fri, 25 Feb 2022 09:39:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645810799; cv=none; d=google.com; s=arc-20160816; b=AuFYkj+FhysLnwx/kV6mNpbENSiUvs4TK2nK1E7Tzbw56nsQjet6BG3HQUozCoS7GX mJlVK7P6WUAoQMgnDxsjVMtAodx3SguZGlzxiMo009cesjERL+LrHsG/+Tp2LRo4AsVG eniXoeW54lbdlAPd8bTJrIeh42nEYIApOyRFswuKZdqw18axaOezcHC/LoMBRNvhE0bE 0KW1RB+QeJM7drcJGiRpvMzg20zV8eBZaEBQanX3L5VOuk18VUlwRPSa02lfYKqaawg0 TOEitPdSlTK99kkfCFjtVmyGywhPHoloMbZfb4JyPQuslIfDGT02edAQiV8ybi73Qh7V LH7g== 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=XY4SHVBrCaEBi8boWyNn/DF5ggnVOu0+2pqg9UXcUDw=; b=Y5aG/3LDrHifViBi/pnq80ESh14e302MpBv0v+aVeEcqfSwYTR3C4dVUg643aOUqJr 5/T52SU4e5HxrIMyyNahgAdw70HuniFge1p+v9Q2SOSOCk+usyh5QCaIIsiOWDN0Ucla YmWwa83j3z5FptjKe4POzOP+2bvnKapHY86s7x8RBT66SBeq9EaYIAf031YYKr7GY2gS WDTRny6nkGUUHKHwNsc/maXoqsIbONp/D526MDVxhVIO2yqmDKp+jjg6L8T1sG2MwQUV 4lm36JEv8uOEMJ2JM6MToqZM0tmc6ZYBIxMu5iIGH7/uVw1rR1kgwbzWRX1jc/GR5IgR E/PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RPeaWTNL; 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 71-20020a25044a000000b006246facc168si2626998ybe.508.2022.02.25.09.39.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:39:59 -0800 (PST) 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=RPeaWTNL; 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]:34794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeZS-0001uO-Ju for patch@linaro.org; Fri, 25 Feb 2022 12:39:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGz-00044D-KB for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:53 -0500 Received: from [2a00:1450:4864:20::62f] (port=43528 helo=mail-ej1-x62f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGk-0002Mv-OZ for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:52 -0500 Received: by mail-ej1-x62f.google.com with SMTP id d10so12125210eje.10 for ; Fri, 25 Feb 2022 09:20:38 -0800 (PST) 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=XY4SHVBrCaEBi8boWyNn/DF5ggnVOu0+2pqg9UXcUDw=; b=RPeaWTNLTMA2GfRyS6OkdFctGXpMUR6y08v0mFOmA83c+AZu4LucbltqcvXGumkGFW hJtKWaR4Wisbi76l75F3uvU6GiDEQVjetwr14MA29RHAT+/MUobHBFUtIqL1SyTnCKuR X/7XwGZx7BJcazyDsR4lhNLA1ucrP7lT3OGtijtJ7LRcyq1BS4Rx/TtIwwOb2l5Uz+s2 kdCt9afWySwEtm127133Ui6pjj7/E/zJUpvT2J78lPn5vjzPbaPnhUmU2byG4vUyy16j 2vuQXyPdI1RqDofaA8jdlMIh0PXRJ671BjqfqZ383tVvRGSWsRBsc/H4BSCZh4ajMsxv fDlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XY4SHVBrCaEBi8boWyNn/DF5ggnVOu0+2pqg9UXcUDw=; b=eRgJTSQlL5ohRrC51EXC0fQcPlN0MeDbxnRCEL/uTTlAnmMF/A5RnkW/eSViigCrVq 1VumcxMa3eOeLTiYC8DkpILllI6ioAXktUUGgibdEikiLOD4TFgJ0ad0tMPbRjtqlXxw u+WaX0dgPxyXWxzRWL9xNJIaaacA1fVv2MhzOQde2QwRmr+prlqa5LfKxnhQHZxU9JxW 3DS+h/EfbhfyThsIhdExfS7te/wDC/tLnOiYn3+8LbKn3qlsCruUmiBrMVjayT+uX9cp 2Nh85vQgFuq4FMgY3aw2v1At68b2E6Lxb4Ypgz9ZVJrLDovz+P3EzS4tuPvDdWu00rsu Dzkg== X-Gm-Message-State: AOAM531gklTGeLmvBUuXoeHqZU7unhJvT2PDkbGIfvzc26hM+gX/Rlj+ qougDHgRmnaMn/31J0wvPklh9w== X-Received: by 2002:a17:906:ae4a:b0:6d0:9eee:e951 with SMTP id lf10-20020a170906ae4a00b006d09eeee951mr6804443ejb.2.1645809637422; Fri, 25 Feb 2022 09:20:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id dt24-20020a170906b79800b006d57e9289f2sm1228264ejb.49.2022.02.25.09.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E5811FFBE; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/18] tests/docker: introduce debian-riscv64-test-cross Date: Fri, 25 Feb 2022 17:20:09 +0000 Message-Id: <20220225172021.3493923-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cross building QEMU for riscv64 still involves messing about with sid and ports. However for building tests we can have a slimmer compiler only container which should be more stable. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220211160309.335014-6-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 7 +++++++ tests/docker/Makefile.include | 2 ++ .../dockerfiles/debian-riscv64-test-cross.docker | 12 ++++++++++++ tests/tcg/configure.sh | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tests/docker/dockerfiles/debian-riscv64-test-cross.docker diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index d38f657131..e622ac2d21 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -131,6 +131,13 @@ riscv64-debian-cross-container: variables: NAME: debian-riscv64-cross +# we can however build TCG tests using a non-sid base +riscv64-debian-test-cross-container: + extends: .container_job_template + stage: containers-layer2 + variables: + NAME: debian-riscv64-test-cross + s390x-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index cce9faab36..e495b163a0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -214,6 +214,7 @@ docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 docker-image-debian-powerpc-test-cross: docker-image-debian11 +docker-image-debian-riscv64-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 @@ -222,6 +223,7 @@ DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross +DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker new file mode 100644 index 0000000000..1d90901298 --- /dev/null +++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker @@ -0,0 +1,12 @@ +# +# Docker 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-riscv64-linux-gnu \ + libc6-dev-riscv64-cross diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index adc95d6a44..0663bd19f4 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -180,7 +180,7 @@ for target in $target_list; do ;; riscv64-*) container_hosts=x86_64 - container_image=debian-riscv64-cross + container_image=debian-riscv64-test-cross container_cross_cc=riscv64-linux-gnu-gcc ;; s390x-*) From patchwork Fri Feb 25 17:20:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545904 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp506690imf; Fri, 25 Feb 2022 09:43:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5hBhs2R/VkqfkZAbvV94BqLw7GE+qdCG0oR33D5OiKuO/bhkeXoGjzJl6Hu/bp83cPpc8 X-Received: by 2002:ac8:5995:0:b0:2de:b46a:7a55 with SMTP id e21-20020ac85995000000b002deb46a7a55mr3932614qte.283.1645811008101; Fri, 25 Feb 2022 09:43:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811008; cv=none; d=google.com; s=arc-20160816; b=zB6sGdD2VvEa6Jvpp/juQv0kUHw2xzagcHYdcf0AUPjqIUoE8wKEs0L5lzvEWVVbho AL8CuvvFKvD4q6eqR3vr4nVWw4jDrstYUdo55ptS+mLuzwXPcZePVIV/UYZg1FktMK5Z EWTeom+hhQvvQda4AoYBj8XCbqwoPpg4kN9JeGYDYmx+xXtP7VNnL0vDhwaXP+YtCShI nSk6o02jhFUwgFjBvxd+3QdYFhk5oEUoBeHErUQwFy3DXicSLNn82/2tJBv+TFDC+OQS zhmhlAq3rnlAyHjk6zblul5HNcsvtmOo9UhgtagCMLgp2kO7N3xXqIbeeSx5UDGhfawP +X6Q== 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=Bj5V9uE7Q5NnDmaF3EDFkpfzYCd8y5i1/u7I2uMgbDk=; b=H/QjWlI1Z5s1I+JUBXQvtmSLow+CBQylStXzDYGd3qg0qI4guVy29OpQGRu9MyJYPf JdpWVH1p0LuIJHQqeheGThhh19v+2boSL2so4s+vlnN4BUhkK2zR2g1dPefSI7oxJPXx 1Nvo4wqSnIov3C/DztXw7XyS4o8HpkGv2SyRkMNeGQdRTIHwTGBY0DC6tXG6J2OExvGc qMwEwTgcpe/tu9jYnoeEV5ujlZ8S+/8x8F37SYOaHnBxytUFhjm4Qz1n4by6nDwOtyim VVmhfdcZmb8n/8mh2vApmlIbel8RsFh2PHXtYfq4G9TW3SvcisHyoGxC0YcnsNIcXJxg 0efw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eMVuD7sf; 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 s3-20020ad45243000000b00432e317fd90si460150qvq.85.2022.02.25.09.43.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:43:28 -0800 (PST) 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=eMVuD7sf; 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]:43460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNecp-0007nd-Lg for patch@linaro.org; Fri, 25 Feb 2022 12:43:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGz-00044C-KL for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:53 -0500 Received: from [2a00:1450:4864:20::533] (port=43917 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGh-0002M6-Kd for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:46 -0500 Received: by mail-ed1-x533.google.com with SMTP id m3so8304830eda.10 for ; Fri, 25 Feb 2022 09:20:34 -0800 (PST) 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=Bj5V9uE7Q5NnDmaF3EDFkpfzYCd8y5i1/u7I2uMgbDk=; b=eMVuD7sfnes4DinpdNf5zKwInHebseQQHPo29WlZMQYV4ZOhn10p/5S7XFTMslbTfx v+fqBWVcBpsdfXFa8QtnAQxgtW0FFOKMTDsaMjFQ7iK9sDaIENYhtzwG0jpsnA654VHU mIjULOs+CuRdoJovzXr++/RwmEQytdwaauCM3+PZEkf8SkM3LtN83sdnIRRep5AngDcF cqKwqd3m7wzlsqq1YApc4OEWL2925rtaBn/64+kxmt59tybdDiQzKQ/wstm5XcEqyzQq HC+F1U/TcZ6y5TIQ0UTKKn/YQm3S1Hhq1dA3ASU9556IYiviYOmQg+3rWpCJvQayIRs4 7Lwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bj5V9uE7Q5NnDmaF3EDFkpfzYCd8y5i1/u7I2uMgbDk=; b=GJfjopjv+o/RE8BzHmjlvfIfZZKEttu3MiDtmJRs39iTPlk2kuAYkro+OroWeburuc y9Pg3byRJibajvJj+924dr25FUeSkhSzJgwJIwF6ECsXHK/P2EDCAHpCYj3Qap49CwAK 8H7vCoGAywMKDRl+UIVSwsA+EZZvIWBAryfatUeFkOwIO7qgR8TXsnNoJmn6xOC+KZwy WY2J/+NtjaSVaq9j1ToJV/1c56v6ip6aVd12vF1SX+SYDiUvfur73x0F3grRlsiqDqMo NOLUvwgarbcWztkIJLo7AfeZIVtZRwyv4wR+ptxARdIzN0xQ+exASSc5aMBOIoQlf9mh BAng== X-Gm-Message-State: AOAM531OYsMOiJS3OP6sUcqp5Ry78h+iSUtWfiXdD/CD3OIGWiHTgkdS RRkCVh6ZQfuCmyIk4EKuUQ47dA== X-Received: by 2002:a50:e004:0:b0:410:a39b:e30c with SMTP id e4-20020a50e004000000b00410a39be30cmr7884808edl.198.1645809633351; Fri, 25 Feb 2022 09:20:33 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g16-20020a170906521000b006d58773e992sm1230799ejm.188.2022.02.25.09.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA4B51FFBF; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/18] scripts/ci: add build env rules for aarch32 on aarch64 Date: Fri, 25 Feb 2022 17:20:10 +0000 Message-Id: <20220225172021.3493923-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" At least the current crop of Aarch64 HW can support running 32 bit EL0 code. Before we can build and test we need a minimal set of packages installed. We can't use "apt build-dep" because it currently gets confused trying to keep two sets of build-deps installed at once. Instead we install a minimal set of libraries that will allow us to continue. Signed-off-by: Alex Bennée Message-Id: <20220211160309.335014-7-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- scripts/ci/setup/build-environment.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 599896cc5b..9182e0c253 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -19,6 +19,13 @@ - '((ansible_version.major == 2) and (ansible_version.minor >= 8)) or (ansible_version.major >= 3)' msg: "Unsuitable ansible version, please use version 2.8.0 or later" + - name: Add armhf foreign architecture to aarch64 hosts + command: dpkg --add-architecture armhf + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['architecture'] == 'aarch64' + - ansible_facts['distribution_version'] == '20.04' + - name: Update apt cache / upgrade packages via apt apt: update_cache: yes @@ -115,6 +122,24 @@ - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '20.04' + - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 20.04 + package: + name: + - binutils-arm-linux-gnueabihf + - gcc-arm-linux-gnueabihf + - libblkid-dev:armhf + - libc6-dev:armhf + - libffi-dev:armhf + - libglib2.0-dev:armhf + - libmount-dev:armhf + - libpcre2-dev:armhf + - libpixman-1-dev:armhf + - zlib1g-dev:armhf + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['distribution_version'] == '20.04' + - ansible_facts['architecture'] == 'aarch64' + - name: Install basic packages to build QEMU on EL8 dnf: # This list of packages start with tests/docker/dockerfiles/centos8.docker From patchwork Fri Feb 25 17:20:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545911 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp513240imf; Fri, 25 Feb 2022 09:53:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJSNgu49XlTrZDT6sxTyvfm+IEHxmtpZx9KtQUlHQjHoxDnlTSJGSt9O0Bgi4wKIbhy/s2 X-Received: by 2002:a37:b95:0:b0:5f1:8711:c404 with SMTP id 143-20020a370b95000000b005f18711c404mr5464813qkl.27.1645811583997; Fri, 25 Feb 2022 09:53:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811583; cv=none; d=google.com; s=arc-20160816; b=sF9tBJfK/8C1vxw8s/0Adz1r4/U1E4CxkFUkLv6U4W9fqsGuM1vtiQx2vJL8HGv3ee 0o6U7stUC9+7bVtmK31lVAjm5RQ5W4akafOYFWTL3jgAJXUOmr5MEthdsyP5H6mh413k YysTk+c6/s2Qubxw3uSOU/Sp1q4SMtBymJqsgznMWJ5VDQp4Bk+wmULB+QKODBY31xnt NuU9ALGMIbuz2HQ8ppYFacXGXtK9LVXItevLPhrwjLaI9eLm5cpAgQwOJ0jAdAV0zA/y idHwR0f1pTuCbkENMH68vqZWwLB2wMm3jP9kp824RQuv0S3Qhv5PSfu2UCIpfaMDVM5U I59Q== 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=Bovqz69HZL8x82kdasie6FxG/SZJtaBt+I+NMEJJYbg=; b=zsXnlSAzOSCg1ctdca1t4Z8wSCvd8PXpANhG8g/AxBVaGa+yIYTS88jcKjgbZDUgux acr3V5SCThCzJHybWHizticfUpSL0lVGdBDZW1NEu9LAMFK+Y3ZB0m8ZJ0NjoAGmY24e aYJMBdajfnbfeHgE2C0lq+K/p2Qeoz2DJDK8p7h/CEebQj+6zKv3Y5tlx1LzTozrrREk 1NG0X2gcbAY+d6S70A+VR+cTSNpwdONkaRcqtBaMC6mMYEqs6ET/nKwrmCjFTlZRHvq3 xDWtNqKtV1Rij5THqnKpQpRdFE0l0/0BQuV7LpeUsYxrowCQGZ4eSiE1m+Q8FAZ61mfF CSEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vZn3y/nf"; 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 a35-20020a05620a43a300b00649130408d2si1701998qkp.329.2022.02.25.09.53.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:53:03 -0800 (PST) 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="vZn3y/nf"; 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]:38326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNem6-0006kV-Ce for patch@linaro.org; Fri, 25 Feb 2022 12:53:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeH0-00046p-IU for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:54 -0500 Received: from [2a00:1450:4864:20::62c] (port=44770 helo=mail-ej1-x62c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGj-0002MF-9i for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:47 -0500 Received: by mail-ej1-x62c.google.com with SMTP id p14so12122149ejf.11 for ; Fri, 25 Feb 2022 09:20:36 -0800 (PST) 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=Bovqz69HZL8x82kdasie6FxG/SZJtaBt+I+NMEJJYbg=; b=vZn3y/nfIpArkRlP1Ne9nD2mwj2rR+w2V+psBUBqS6izex5Qgms3sRLboGAY9FNk6T +w7ggtF7IkJMtPg5qJ1fvif4P2YSIRK5Wx4GhQp+7s70z7QiJOJVoRnLxTskeRX/Cfu7 kHLy9JGXVSiibP4S4xOr3eGlm69SdYNpUkjc7njZIyuMYa+8blwkO1qio3dw42u/9xde NTaoAdOjo4EO4gAQohzPuJRnsLdxZpQw/CPDqGHegqL36gqU3kzt+/+odaSHoVYzsx7h O6GicMTy7Rc8HtgWxpZ3dTY8mbzyDOj8JWpDmqDYPZAfVKYjupUya4SJJRe5qUwTgt/f qEBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bovqz69HZL8x82kdasie6FxG/SZJtaBt+I+NMEJJYbg=; b=zr3b/J7a2cfokHMkG44fX9vpj0VsF95rULHOqTWkSESAcdfwNdYDKcGou+xMzCp4Zm XPBJciq11Fo7yuxkb7ho+COgtopZdYA1sGAdeQqjfpjccNAix5yp18LugnI7vuPz80Iu osjFoYFSz0L2pyg/kaDFiFtIqOqo4/aVUfFBtypp1H5C8vh2XFTQUWJqPWtKz6DPW2PL 8CIfA+PZJI9R/U+XXM18AURkML3Cmk29K/dC8Lr1PUs3+s8I6IePw0JUOIbBLbhN68Ox jnHDkeOWTlGJSedz2cwIwWArzjqqVYu7FEz6xxpjoGLUBtvnk6OCao338S41lYB1U/lv AFyA== X-Gm-Message-State: AOAM532nPEIUr9ixPKQ57VMfl3wY28vvKJRUuUmJ/BxxJ+KvVVOb/sDT RKgmEeY+rslc+B44E8wcST+bXw== X-Received: by 2002:a17:906:8505:b0:6cf:2767:f447 with SMTP id i5-20020a170906850500b006cf2767f447mr6811169ejx.321.1645809634343; Fri, 25 Feb 2022 09:20:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u24-20020a50a418000000b00412b67facd1sm1566599edb.91.2022.02.25.09.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C529C1FFC0; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/18] scripts/ci: allow for a secondary runner Date: Fri, 25 Feb 2022 17:20:11 +0000 Message-Id: <20220225172021.3493923-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Some HW can run multiple architecture profiles so we can install a secondary runner to build and run tests for those profiles. This allows setting up secondary service. [AJB: this is a fairly ugly hack, I'm sure this could be expressed in a neater way] Signed-off-by: Alex Bennée Message-Id: <20220211160309.335014-8-alex.bennee@linaro.org> Acked-by: Richard Henderson --- scripts/ci/setup/gitlab-runner.yml | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 1127db516f..19bfd68f7e 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -69,3 +69,37 @@ name: gitlab-runner state: started enabled: yes + + - name: Download secondary gitlab-runner + get_url: + dest: /usr/local/bin/gitlab-runner-arm + url: "https://s3.amazonaws.com/gitlab-runner-downloads/v{{ gitlab_runner_version }}/binaries/gitlab-runner-{{ gitlab_runner_os }}-arm" + owner: gitlab-runner + group: gitlab-runner + mode: u=rwx,g=rwx,o=rx + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['architecture'] == 'aarch64' + - ansible_facts['distribution_version'] == '20.04' + + - name: Register secondary gitlab-runner + command: "/usr/local/bin/gitlab-runner-arm register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" + + - name: Install the secondary gitlab-runner service using its own functionality + command: /usr/local/bin/gitlab-runner-arm install --user gitlab-runner --working-directory /home/gitlab-runner/arm -n gitlab-runner-arm + register: gitlab_runner_install_service_result + failed_when: "gitlab_runner_install_service_result.rc != 0 and \"already exists\" not in gitlab_runner_install_service_result.stderr" + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['architecture'] == 'aarch64' + - ansible_facts['distribution_version'] == '20.04' + + - name: Enable the secondary gitlab-runner service + service: + name: gitlab-runner-arm + state: started + enabled: yes + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['architecture'] == 'aarch64' + - ansible_facts['distribution_version'] == '20.04' From patchwork Fri Feb 25 17:20:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545909 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp509694imf; Fri, 25 Feb 2022 09:47:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJy19xQR1qPyPVSG4m/od0Ik7sGFABX34v8KzRlhFzTAy/1HA6elwKoSSw+U8fkCEae3uvLD X-Received: by 2002:a81:18d3:0:b0:2d7:c690:c263 with SMTP id 202-20020a8118d3000000b002d7c690c263mr8795088ywy.505.1645811270092; Fri, 25 Feb 2022 09:47:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811270; cv=none; d=google.com; s=arc-20160816; b=LrlycrYrUCK0fQ7fQkwYWTutjQdMD6jUqs/pfkK5KajO/9hnBjBUgyL0cCjHfuQd9Z eKEHB0/J+B9YIAXR1zRV0dALeIFzmpDe71oWDwuXxMbXFppFqAkkAkns244z125Xnldo c2vuMNgblBllJMh4dPKNfGddlvFFtrxROpj0TN2QZbGYYE+bAi2c95JzeGArwJwWIApX IAUBnhoA0RVgxKWUZ0fltnp/10ZHB+AfWzQ3YMd/RKCWQXOTKEAtnH/be+1jh2hxjKri dLTNp28RSq+QLVDTVUjniq43Ys3Xh7BfSqR45Oh92G81k8WTeYLPYojoiP/2zuu+I6gB JBgA== 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=eyq1RnOytaQPpyyRqATZ3JPobYbhQdtwSJ1ZuN+nJzk=; b=wp32vW4mE0PSbqadKYHQq39QSVSlats9iRWXQUWOt+iFh0RdGWsnh3GADUJRnJFYPg 191Whxk7xWf+6zXEnsKzmoypxyL+abgFKC1/LCy0OyaLdNFI4j9tsV9ZX3D2B1SYU9G9 VDfZlbNqml8pn/b9D8SiK2ptXUovS+DbKniAVhCCBs3PmpbwtU+qru5S85zv7DtetpKm eRvBwUcCd1My+7oYETzq2CMDHlvI+yHHUhRLpov30qeeyl9hww2Y9am9WXlc60xjgT0q 3k4QS5uuttHY7W1Jf5K8mGq0k09kurW6IrDjrO+CSeXEpAnk5AmxAL10fIbzif6JHc/z H1bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wVB7UuJG; 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 n5-20020a81c805000000b002d6464c229bsi2757037ywi.3.2022.02.25.09.47.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:47:50 -0800 (PST) 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=wVB7UuJG; 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]:55208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeh3-0007Ox-JK for patch@linaro.org; Fri, 25 Feb 2022 12:47:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGz-00044I-MZ for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:53 -0500 Received: from [2a00:1450:4864:20::631] (port=41919 helo=mail-ej1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGm-0002O4-H9 for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:53 -0500 Received: by mail-ej1-x631.google.com with SMTP id a8so12149689ejc.8 for ; Fri, 25 Feb 2022 09:20:40 -0800 (PST) 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=eyq1RnOytaQPpyyRqATZ3JPobYbhQdtwSJ1ZuN+nJzk=; b=wVB7UuJGzmCFKqFPsFyfVUJ77fB0uBRgbDgD8WJpSkLhf78zEEmj/SD7xhyNMlUSlE m1HPUKUSmMrsc3HtkhDW4Jsnq0foQeIoG2Y0tdharkPNjniqVJwvNKO4ZQ5VAVyRqzqX P8x7BA86ndyF2Q6CTegSK+sm1M78XO4mYJnADdpcsEUqLVVR5H9Btt1p8UGjVnr+j78s WCdgmYOGGRjStbjDLLOqxzJx5/urFsvVUReIro38QIfGsFyF8MP/QWe13eSc7uL51Le6 xU/6/mCCjR1aOKvcsbmOxySYYypubtjVJLLVnQWt/NuCzYwH/VrpmDOzsiB0T386qMPl Q4cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eyq1RnOytaQPpyyRqATZ3JPobYbhQdtwSJ1ZuN+nJzk=; b=ohtI7HTNHznjzAek0uoi4awqFlAj032+pfuoneFUaMzUytsOyzRDrAVOGxVwvONc9h pZU/VzXn6rTFmIJpEu/xM0nqBPKcSv8SEPla9Fejb9jeN+oSKDfQlEtJ6npEdjlCeS5f /MwMkyZSKq14Mpu2s82TUs2/lsUnNOGTjSsiYI1tMFuxliH29Gadus2mfptclxDWxZ4M dM7atv3sv5ox7j3sT/SAE+JIEwPnQ3PwWJpkNn2NufzsVdJl7noVjj1ZyUfqXB5IdUa8 N3Ni4tZVDPJf+qz2PHrr+KzEy8bYQeEjVtUU+2UOyX5t1IReu68xD5Qamg9nOpAl0c7I qtgQ== X-Gm-Message-State: AOAM530Beved7nVdyzVcUXeE9gbu7YesLzp2G+xPnQBNqIPu/RXjW5FE BVJg0ZnLZXAv7hdWQrFBJjUi6A== X-Received: by 2002:a17:906:4116:b0:6cd:1980:5ad0 with SMTP id j22-20020a170906411600b006cd19805ad0mr7344807ejk.595.1645809639221; Fri, 25 Feb 2022 09:20:39 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b14-20020a1709063f8e00b006ae0a666c02sm1234540ejj.96.2022.02.25.09.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DFF731FFC1; Fri, 25 Feb 2022 17:20:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/18] gitlab: add a new aarch32 custom runner definition Date: Fri, 25 Feb 2022 17:20:12 +0000 Message-Id: <20220225172021.3493923-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Although running on aarch64 hardware we can still target 32bit builds with a cross compiler and run the resulting binaries. Signed-off-by: Alex Bennée Message-Id: <20220211160309.335014-9-alex.bennee@linaro.org> --- docs/devel/ci-jobs.rst.inc | 7 ++++++ .../custom-runners/ubuntu-20.40-aarch32.yml | 23 +++++++++++++++++++ scripts/ci/setup/gitlab-runner.yml | 4 ++++ 3 files changed, 34 insertions(+) create mode 100644 .gitlab-ci.d/custom-runners/ubuntu-20.40-aarch32.yml diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index db3f571d5f..92e25872aa 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -44,6 +44,13 @@ If you've got access to an aarch64 host that can be used as a gitlab-CI runner, you can set this variable to enable the tests that require this kind of host. The runner should be tagged with "aarch64". +AARCH32_RUNNER_AVAILABLE +~~~~~~~~~~~~~~~~~~~~~~~~ +If you've got access to an armhf host or an arch64 host that can run +aarch32 EL0 code to be used as a gitlab-CI runner, you can set this +variable to enable the tests that require this kind of host. The +runner should be tagged with "aarch32". + S390X_RUNNER_AVAILABLE ~~~~~~~~~~~~~~~~~~~~~~ If you've got access to an IBM Z host that can be used as a gitlab-CI diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.40-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.40-aarch32.yml new file mode 100644 index 0000000000..9c589bc4cf --- /dev/null +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.40-aarch32.yml @@ -0,0 +1,23 @@ +# All ubuntu-20.04 jobs should run successfully in an environment +# setup by the scripts/ci/setup/qemu/build-environment.yml task +# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" + +ubuntu-20.04-aarch32-all: + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch32 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH32_RUNNER_AVAILABLE" + when: manual + allow_failure: true + script: + - mkdir build + - cd build + - ../configure --cross-prefix=arm-linux-gnueabihf- + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 19bfd68f7e..33128be85d 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -84,6 +84,10 @@ - name: Register secondary gitlab-runner command: "/usr/local/bin/gitlab-runner-arm register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['architecture'] == 'aarch64' + - ansible_facts['distribution_version'] == '20.04' - name: Install the secondary gitlab-runner service using its own functionality command: /usr/local/bin/gitlab-runner-arm install --user gitlab-runner --working-directory /home/gitlab-runner/arm -n gitlab-runner-arm From patchwork Fri Feb 25 17:20:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545906 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp507094imf; Fri, 25 Feb 2022 09:44:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwiTr+OVjqgG3sQWpqg/2LO1rzStXqfEzabZR0XuKXNPlvJzpMD79K7RUfX7OeoPGr8Pzgp X-Received: by 2002:a0d:c645:0:b0:2d0:c410:9a8 with SMTP id i66-20020a0dc645000000b002d0c41009a8mr8650085ywd.340.1645811047606; Fri, 25 Feb 2022 09:44:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811047; cv=none; d=google.com; s=arc-20160816; b=vdqzPIicyBZm0KwoyKqf8OFTXLpQIy8YXyESipFnT5O4BB7f2/k+Wi3qaXa5RQBpQu TN8IahEZrRd2qUxdCRCwE9AbvxFdQUAV+I8/BtUSa6OTM/A+svW0qZtPcdefLuwlyOBu CdiyjbJ+oywmFAh3rOvcIVbOHI+chRPeJneL0U4Qv+5YDuE1WNAL1AJZo3fsCXM/kHFA NnNCLvzmc4tY8i5g8hwcrUqNe1c5D0Nsrl8KL40wJ1MFMHQsr1105lzjHeqw2uCpHmaq NCYYsam3DFtws3HdxPme0C9jpbtEp/xH4yCUE9ZD/AY0Q2BPP71/1qjqToSQ355uCoXo jl8g== 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=Ns+fYWljoLwi6Vr9txF+6QpXpSI1wN1Odp6zKAkN3xM=; b=gAnOcvKCPpijhX/vW/lQGRBXwnA0WZeZIkWqD2oib8idlCwacMY2eWSh7EZL3ViiD6 AxhMmI6P0Ayk6ZbmYAq+5/KWaLrFZMBplujiEp62Jr51YbT4CL7TBWz3W5pGf5hXWr2I X2J2fy1n1OSSHpBrFDeUOc37leWvk+ZePrq2ghixtulYRxxYQVFks/WwDzD48LVTdNLn ZqUg1T7rGNfFSkxGdR+6M0mxIlP3ljI6QocQQwy2c3R0JhOmNfXFV1fvEiTpDXf75gFA afbzDpM+mHVoC/onKmJgEu51z191w2utCni5xtyFSRSwAqPz3QeKeXuZ6XRu2+hWYDph xNiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mElp9feF; 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 t18-20020a5b03d2000000b006247fead37fsi2342899ybp.281.2022.02.25.09.44.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:44:07 -0800 (PST) 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=mElp9feF; 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]:46648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNedT-0001Y0-41 for patch@linaro.org; Fri, 25 Feb 2022 12:44:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeGz-00044B-JC for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:53 -0500 Received: from [2a00:1450:4864:20::534] (port=35685 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGg-0002Lj-6l for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:44 -0500 Received: by mail-ed1-x534.google.com with SMTP id bq11so8374794edb.2 for ; Fri, 25 Feb 2022 09:20:33 -0800 (PST) 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=Ns+fYWljoLwi6Vr9txF+6QpXpSI1wN1Odp6zKAkN3xM=; b=mElp9feFVLRiU8AnVqG5imkSHn/hXUNVoCNeTyBFOUP/OnAaYY8i9DLqfMvypQPnIH MKgoeWz3Zj2wn3GCqS2U5pi5WWb7ve4Te1XIy2SmFRNlUTplQ1MHdLC+Y6Ad+1yOpsnl y0TJ7my6Rmr+S9X9RRhnLvwX1JVChZj+jW0JSfre0OAn2SajtwHzIoGKIp4z72oS/2TG /WIzXTvX14jfxOfnxdS/G5CCkC/TsEbizepv4exNOy8wnV/YkxnxtCIKL7bu+VZyaTKh 7//auBYyNKWeYQZJgQohzUyvJIquZ9jXid+I7LBC/fGb25sn2WE0R9B2O7H7YxLeMlYw dTPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ns+fYWljoLwi6Vr9txF+6QpXpSI1wN1Odp6zKAkN3xM=; b=xGyPV45PUnS+6/TIQJ2TBMI9EuVP7PJ5ZuNnwWnbI7yIeMTiC8w3UMedrnpcF56l5I uDn49QP+YUg581LypzBY4VD3VfYJfyJLvOVSQsKzG1nCbqlXrpxFQGHNO0hKTs7IftI4 NnEm24FIunHhy+EShEsfBm5B19sQZaS+ozPZmuVY6Ef7TNXYrcwuFYJVlIIdjEljyVgL 5wzKhcNAq3sZAvrbjIFVTVyCptGoDpkyZzQlX/1KgkFIy8mfVRVeSqBiKII+qwT7N+KB gegfRgwjrVHPD5mM1kDCG5do1cYHUqkvEjoXgWmFWgTnQE0p+djEu2ma/YrAxXA/8dik QgiA== X-Gm-Message-State: AOAM531Gwq/ufT5UmOOhf+1WgVpl3wmz966dF25JmxzXSWqkKdH4WaeL uYYohw+I2+Lq1M7HmSF7Sp0wew== X-Received: by 2002:a05:6402:40c1:b0:412:b240:dfeb with SMTP id z1-20020a05640240c100b00412b240dfebmr7809739edb.239.1645809632251; Fri, 25 Feb 2022 09:20:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 17-20020a170906059100b006cee1bceddasm1202190ejn.130.2022.02.25.09.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 055B51FFC2; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/18] tests/tcg/ppc64: clean-up handling of byte-reverse Date: Fri, 25 Feb 2022 17:20:13 +0000 Message-Id: <20220225172021.3493923-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rather than having an else leg for the missing compiler case we can simply just not add the test - the same way as is done for ppc64le. Also while we are at it fix up the compiler invocation. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/ppc64/Makefile.target | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target index 0368007028..9d6dfc1e26 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -10,19 +10,14 @@ PPC64_TESTS=bcdsub non_signalling_xscv endif $(PPC64_TESTS): CFLAGS += -mpower8-vector -PPC64_TESTS += byte_reverse PPC64_TESTS += mtfsf + ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +PPC64_TESTS += byte_reverse +endif +byte_reverse: CFLAGS += -mcpu=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 PPC64_TESTS += signal_save_restore_xer From patchwork Fri Feb 25 17:20:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545905 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp506704imf; Fri, 25 Feb 2022 09:43:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfzy2dB7GRv8JOWp7nSRZOyrqREd8OA1Fa1Pvd6vQJWJMOBgB8r6ZMXDxYURx/cScH1DWt X-Received: by 2002:a25:3b43:0:b0:622:6514:da4 with SMTP id i64-20020a253b43000000b0062265140da4mr8253573yba.241.1645811011289; Fri, 25 Feb 2022 09:43:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811011; cv=none; d=google.com; s=arc-20160816; b=SuGlpwPtef34sAA1gzlHrX3lHAuzX86rNpDnlDbEtqP8PlK0/u+rEvFFkdcSwLT/HG szuk4dQFFD+It1AQXvXWVxrTnwXRkfJ+F+u7Lbi4fJcgUrn1kKj6MLKY61rdAxmd0NL2 TsEBGwEieikQ/w6eDRWFar28v7uLc9IJFnn3Tcjw8j4h3Ekf63qgYZfQ5J4o1GSYzp9R 6FWWxu/UY5a5XaawYXYefk/4xZRfz9w7LbrKnYRJW4bOVSzKYprgGHbzRkuIi2phMX5+ vX2KIX8H6duYfmMpyukJXRWCFFWc7EIjuzgbG7b3ebVwmLGuOCNXJC3N5rPbNYLXZjtF q+LQ== 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=RH/EQPouYDfawCxme5y1a0aybgkGhiPJQumRKhl1sDc=; b=reNA2GhyWwq4xzJ50Qisv2vLne9Rr4QQ2nm+obHViYGibvTQqStq6SGbmRUd887s5r 9PkbV23xIvP4rHt3iUx5f27jvpcxS9guyfzCPTjlLgSY14kNFeQGvno76cgR1gd9SKbd C044KBkeh2FJq/9KMNxYSu8wDaz6JvH18LiD8wa06Pv3o3/BInsGNNJ9HeqoTLgJS2pt 2khmgcyIs4YeNrTPtiqXYq2XFMd+0HsQGvkRFZ7MZgZ/CK68/BILucAS8Dcp790YjpVi KmLHIgTZ6DFA0f4yZOrmgyHoxUvISKVj3KY7Z+YlWR2HWUpUCZ5URyaxb8uupr/Ibq1P yaOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RgmrFtsN; 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 185-20020a2500c2000000b0061224034e87si2474568yba.535.2022.02.25.09.43.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:43:31 -0800 (PST) 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=RgmrFtsN; 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]:43932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNecs-000865-Pg for patch@linaro.org; Fri, 25 Feb 2022 12:43:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeH1-00048f-44 for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:55 -0500 Received: from [2a00:1450:4864:20::631] (port=44777 helo=mail-ej1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGo-0002Ot-NH for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:54 -0500 Received: by mail-ej1-x631.google.com with SMTP id p14so12122680ejf.11 for ; Fri, 25 Feb 2022 09:20:42 -0800 (PST) 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=RH/EQPouYDfawCxme5y1a0aybgkGhiPJQumRKhl1sDc=; b=RgmrFtsNjlZnnNbsMz01CcHo9UzVo9UIupk3b3Ci/v095ajCccKzAJ+0LP1wWCNUkE K+KLbKc8ymH4/2hFiT4UsvD8VteHABA5Xroa6l6WVK3/fB1ABdCVvcaYiDNrdksWGAAd OXON7/ljzbJ1K106FSCHxcZmVmizDDW3fcOumw9Mkm3/Zd2HAMaL5tOGJTjUgnENwBQS SjF/iLOXbWKJIrIaEwiPGhvbHoJGBbCjOH7/BN6L8JXqgnsofmujVYecfZb8xp5dSXK0 bQvq3CumqRjm8Dy5TJCVSRM4fDnr+YxpNB6FVNU2H5T2aDNDWjSdurYPSMxULja0NjyI jfGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RH/EQPouYDfawCxme5y1a0aybgkGhiPJQumRKhl1sDc=; b=U3xbv93bF6DOPAANXzAJaLMMwwvLSkSgM8YgVoBWB5TvzxamACmyVtc67cUJ+924kO Gus+vXw/La9GvsaWSd8u9d8AyEdo7UZpuIvrV9NyYMBFzvTrZQ0BtyV/lLjBwzRH9ClG 91rwqgxeNf0bJLkuB1eYsnpIiyuq/8fnaWgXc2z+QHoKQVHIxELRRmaAqUpXRawzH2hw 7OH2MEbsCjSK1aI8X/3vIri6wQuCPsoqIkzl1Fe/y5lwv19y/cVGDnUpeK3SenlEBRsE F67wmkuSLgXdolaSctkd/TGRDqrtnTsnu8c0+YbpSs07yjw5yL7VghzvUScSrXRPnrrc QqZg== X-Gm-Message-State: AOAM530Q/g3TZdigH4MsppHeujAeLq0fMy/9FUQB0iulU4Zi7GqBpfrM IxRZbhjyKJ8jSQj+O+BOzDBfSw== X-Received: by 2002:a17:906:4a09:b0:6d0:7f19:d738 with SMTP id w9-20020a1709064a0900b006d07f19d738mr6824090eju.76.1645809641386; Fri, 25 Feb 2022 09:20:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d25-20020aa7d699000000b004128cfcc228sm1655504edr.5.2022.02.25.09.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:38 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 12DFA1FFC3; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/18] tests/tcg: build sha1-vector with O3 and compare Date: Fri, 25 Feb 2022 17:20:14 +0000 Message-Id: <20220225172021.3493923-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , berrange@redhat.com, sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, qemu-arm@nongnu.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" The aim of this is to test code generation for vectorised operations. Unfortunately gcc struggles to do much with the messy sha1 code (try -fopt-info-vec-missed to see why). However it's better than nothing. We assume the non-vectorised output is gold and baring compiler bugs the outputs should match. Signed-off-by: Alex Bennée Message-Id: <20220202191242.652607-3-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Message-Id: <20220211160309.335014-10-alex.bennee@linaro.org> --- tests/tcg/aarch64/Makefile.target | 10 ++++++++++ tests/tcg/arm/Makefile.target | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 1d967901bd..df3f8e9438 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -50,6 +50,16 @@ sysregs: CFLAGS+=-march=armv8.1-a+sve AARCH64_TESTS += sve-ioctls sve-ioctls: CFLAGS+=-march=armv8.1-a+sve +# Vector SHA1 +sha1-vector: CFLAGS=-O3 +sha1-vector: sha1.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) +run-sha1-vector: sha1-vector run-sha1 + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") + $(call diff-out, sha1-vector, sha1.out) + +TESTS += sha1-vector + ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index f509d823d4..2dc94931c3 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -70,6 +70,15 @@ endif ARM_TESTS += commpage +# Vector SHA1 +sha1-vector: CFLAGS=-O3 +sha1-vector: sha1.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) +run-sha1-vector: sha1-vector run-sha1 + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") + $(call diff-out, sha1-vector, sha1.out) + +ARM_TESTS += sha1-vector TESTS += $(ARM_TESTS) # On ARM Linux only supports 4k pages From patchwork Fri Feb 25 17:20:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545914 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp522823imf; Fri, 25 Feb 2022 10:03:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyChB6gEEQf6i5j+lD8Q/Xvcds6WxsYWsXDto5iRpgnZnsIuqRG2BvBVQLSogbtFWjL5AS X-Received: by 2002:a67:ef98:0:b0:31b:fdff:f374 with SMTP id r24-20020a67ef98000000b0031bfdfff374mr4127382vsp.56.1645812229547; Fri, 25 Feb 2022 10:03:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645812229; cv=none; d=google.com; s=arc-20160816; b=cF6FGhRymi5u0F31MRJyWp0f9xn8ad27o4tde5boVdzEAtStWfEfz3/biRGcgVFAJ3 gNlGr98drVwY1aLpDKQyyZ3C4ZuU5nQndD0OXN3GCm3e/a3fXTCOiHKR5GQ9ptnG0t5S OdmRhNK5dJv5517To9XOEg5TdwehwWJd6g8MhiC3zIEpgvKrMeybQeginjTb1EOTThgK hjdhkXJgiDWNEIuVhkQcBrOlq22qd9lPJLSE0jybJwRXewo0YdlcPuy8qe0sXAl6gdYS YG93nvJ1RLD5CYEoGGQ/lsPoNw1znEKlJIZzz1Bjeaqf/ygwuRXya2xNqsyvj8k6zA43 Ssxg== 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=f97lQww30kJn7M0XtvF8dTrxjJqTxbQrP1jhn9lKM3s=; b=Xl3KS5bzPpm7Duo0U4b+3lGQ9BS2KUo+muJhzgEh7EvkbcndhJ9mfog2lvg3omuK1t aK5VwMq0+ki+7pEmClMuxjhjSvnmYNgV/az5PUQRagJN5wbAQyMUyGS9a2UXe+BvYs4f 0JXoKncs/Vo+b3uaXMfLQa3PTEFbZtewSARcQ5pxEQ7lvdd1dlpV5zCSyY0L4JpioKz3 YDQmRJBZ0p5gVblGmooS9S7HXnqOHxi7EcdM8YWaXXOl9FDxHc/46dbZOvhR9eHXO8N1 SiRE13xv1x9MFBWn2623/wDmw08F9Ee8deKFDdlFJbjYi+x0PNcBAwjjSWRvvZ+9eNWK upsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="OGcn/zvm"; 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 u5-20020ac5c925000000b00328f07ff7cesi204922vkl.300.2022.02.25.10.03.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 10:03:49 -0800 (PST) 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="OGcn/zvm"; 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]:36336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNewW-00089u-S5 for patch@linaro.org; Fri, 25 Feb 2022 13:03:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeH9-0004Pt-Iy for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:21:04 -0500 Received: from [2a00:1450:4864:20::52c] (port=38520 helo=mail-ed1-x52c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGz-0002Qg-4g for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:21:03 -0500 Received: by mail-ed1-x52c.google.com with SMTP id s24so8344901edr.5 for ; Fri, 25 Feb 2022 09:20:48 -0800 (PST) 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=f97lQww30kJn7M0XtvF8dTrxjJqTxbQrP1jhn9lKM3s=; b=OGcn/zvmB+uEdpbUqbU1JaNrZiK98UAoYZ0U/mShjOfuWxR+ul2WqlrJI5mkl7PP4i uMHXEzTKJsroVWdCKPX7pvf9rFmLWac0wn5VoxczfAa3PUJywzX03qlcyN9kMdYZYvml hf/2Zg2DlJ8z4d86DxzwPXrQyfaaR6n1aufRKYzAVLm7dp/LoCwkTR/GC9WvP0f6VBw5 LPj2IwG2GrAZGnvNOH6nx9X0Lh6sDZ/cI95RQ70cROvPuKATkiOufn7WA4h8hTk8woBs /HagndsIAZ+MVCCuCUXRKg1seoIY+9bFiIbZIA33fGnGGeZDU4iMRrRgAJfj1IQ/d39W 6GzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f97lQww30kJn7M0XtvF8dTrxjJqTxbQrP1jhn9lKM3s=; b=KBhd9s4LwnDFDrmWIk1wtMjKYxHwLfY0gTaD6RVD1ajn5yyUNthEQXOKAmyCWq0/eE I2kA8ay1bwWLgf7iTVKHrGvwxIjLUPwsbMGEB+DVPAe7GD07iAcTj77BG3xEOQnk7bku EWBMlcmwreJQUvYYcifkt0r+q2LYId980o0Oif+nZYahkyF7sd/43GI+mDtxiTr/arOX e/OKYoMzkVPXt9HEqexp403xVKE99v4LhQ+s6N1ABVvcaAYjwTBirn0RGpyVXbuHys3B pWHE+qZeKks0jhVG2FIlVUv0r+wBqw6Z7npelFCHldp9hmJGYySQysFGaC+6eoHm7jOH HK8A== X-Gm-Message-State: AOAM532J5HL9AWpUA32Ym07NXiRO1HQoF9LlOHHpuMHdjn9L+vUbdLho eEE0a8d1VPpMREgKqH53XP7ZkQ== X-Received: by 2002:a05:6402:40c1:b0:412:b240:dfeb with SMTP id z1-20020a05640240c100b00412b240dfebmr7810710edb.239.1645809647035; Fri, 25 Feb 2022 09:20:47 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l21-20020a056402231500b0041327b58030sm1670104eda.2.2022.02.25.09.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:38 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 310441FFC4; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/18] tests/tcg: add sha512 test Date: Fri, 25 Feb 2022 17:20:15 +0000 Message-Id: <20220225172021.3493923-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This imports the sha512 algorithm and related tests from ccan which offers a cleaner hash implementation with its own validation tests with which we can exercise TCG code generations. Signed-off-by: Alex Bennée Acked-by: Richard Henderson Message-Id: <20220211160309.335014-11-alex.bennee@linaro.org> --- v2 - s/#if BYTE_ORDER == BIG_ENDIAN/#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ --- tests/tcg/multiarch/sha512.c | 990 +++++++++++++++++++++++++++++++++++ 1 file changed, 990 insertions(+) create mode 100644 tests/tcg/multiarch/sha512.c diff --git a/tests/tcg/multiarch/sha512.c b/tests/tcg/multiarch/sha512.c new file mode 100644 index 0000000000..e1729828b9 --- /dev/null +++ b/tests/tcg/multiarch/sha512.c @@ -0,0 +1,990 @@ +/* + * sha512 test based on CCAN: https://ccodearchive.net/info/crypto/sha512.html + * + * src/crypto/sha512.cpp commit f914f1a746d7f91951c1da262a4a749dd3ebfa71 + * Copyright (c) 2014 The Bitcoin Core developers + * Distributed under the MIT software license, see: + * http://www.opensource.org/licenses/mit-license.php. + * + * SPDX-License-Identifier: MIT CC0-1.0 + */ +#define _GNU_SOURCE /* See feature_test_macros(7) */ + +#include +#include +#include +#include +#include +#include + +/* Required portions from endian.h */ + +/** + * BSWAP_64 - reverse bytes in a constant uint64_t value. + * @val: constantvalue whose bytes to swap. + * + * Designed to be usable in constant-requiring initializers. + * + * Example: + * struct mystruct { + * char buf[BSWAP_64(0xff00000000000000ULL)]; + * }; + */ +#define BSWAP_64(val) \ + ((((uint64_t)(val) & 0x00000000000000ffULL) << 56) \ + | (((uint64_t)(val) & 0x000000000000ff00ULL) << 40) \ + | (((uint64_t)(val) & 0x0000000000ff0000ULL) << 24) \ + | (((uint64_t)(val) & 0x00000000ff000000ULL) << 8) \ + | (((uint64_t)(val) & 0x000000ff00000000ULL) >> 8) \ + | (((uint64_t)(val) & 0x0000ff0000000000ULL) >> 24) \ + | (((uint64_t)(val) & 0x00ff000000000000ULL) >> 40) \ + | (((uint64_t)(val) & 0xff00000000000000ULL) >> 56)) + + +typedef uint64_t beint64_t; + +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + +/** + * CPU_TO_BE64 - convert a constant uint64_t value to big-endian + * @native: constant to convert + */ +#define CPU_TO_BE64(native) ((beint64_t)(native)) +/** + * BE64_TO_CPU - convert a big-endian uint64_t constant + * @le_val: big-endian constant to convert + */ +#define BE64_TO_CPU(le_val) ((uint64_t)(le_val)) + +#else /* ... HAVE_LITTLE_ENDIAN */ +#define CPU_TO_BE64(native) ((beint64_t)BSWAP_64(native)) +#define BE64_TO_CPU(le_val) BSWAP_64((uint64_t)le_val) +#endif /* HAVE_LITTE_ENDIAN */ + +/** + * cpu_to_be64 - convert a uint64_t value to big endian. + * @native: value to convert + */ +static inline beint64_t cpu_to_be64(uint64_t native) +{ + return CPU_TO_BE64(native); +} + +/** + * be64_to_cpu - convert a big-endian uint64_t value + * @be_val: big-endian value to convert + */ +static inline uint64_t be64_to_cpu(beint64_t be_val) +{ + return BE64_TO_CPU(be_val); +} + +/* From compiler.h */ + +#ifndef UNUSED +/** + * UNUSED - a parameter is unused + * + * Some compilers (eg. gcc with -W or -Wunused) warn about unused + * function parameters. This suppresses such warnings and indicates + * to the reader that it's deliberate. + * + * Example: + * // This is used as a callback, so needs to have this prototype. + * static int some_callback(void *unused UNUSED) + * { + * return 0; + * } + */ +#define UNUSED __attribute__((__unused__)) +#endif + +/* From sha512.h */ + +/** + * struct sha512 - structure representing a completed SHA512. + * @u.u8: an unsigned char array. + * @u.u64: a 64-bit integer array. + * + * Other fields may be added to the union in future. + */ +struct sha512 { + union { + uint64_t u64[8]; + unsigned char u8[64]; + } u; +}; + +/** + * sha512 - return sha512 of an object. + * @sha512: the sha512 to fill in + * @p: pointer to memory, + * @size: the number of bytes pointed to by @p + * + * The bytes pointed to by @p is SHA512 hashed into @sha512. This is + * equivalent to sha512_init(), sha512_update() then sha512_done(). + */ +void sha512(struct sha512 *sha, const void *p, size_t size); + +/** + * struct sha512_ctx - structure to store running context for sha512 + */ +struct sha512_ctx { + uint64_t s[8]; + union { + uint64_t u64[16]; + unsigned char u8[128]; + } buf; + size_t bytes; +}; + +/** + * sha512_init - initialize an SHA512 context. + * @ctx: the sha512_ctx to initialize + * + * This must be called before sha512_update or sha512_done, or + * alternately you can assign SHA512_INIT. + * + * If it was already initialized, this forgets anything which was + * hashed before. + * + * Example: + * static void hash_all(const char **arr, struct sha512 *hash) + * { + * size_t i; + * struct sha512_ctx ctx; + * + * sha512_init(&ctx); + * for (i = 0; arr[i]; i++) + * sha512_update(&ctx, arr[i], strlen(arr[i])); + * sha512_done(&ctx, hash); + * } + */ +void sha512_init(struct sha512_ctx *ctx); + +/** + * SHA512_INIT - initializer for an SHA512 context. + * + * This can be used to statically initialize an SHA512 context (instead + * of sha512_init()). + * + * Example: + * static void hash_all(const char **arr, struct sha512 *hash) + * { + * size_t i; + * struct sha512_ctx ctx = SHA512_INIT; + * + * for (i = 0; arr[i]; i++) + * sha512_update(&ctx, arr[i], strlen(arr[i])); + * sha512_done(&ctx, hash); + * } + */ +#define SHA512_INIT \ + { { 0x6a09e667f3bcc908ull, 0xbb67ae8584caa73bull, \ + 0x3c6ef372fe94f82bull, 0xa54ff53a5f1d36f1ull, \ + 0x510e527fade682d1ull, 0x9b05688c2b3e6c1full, \ + 0x1f83d9abfb41bd6bull, 0x5be0cd19137e2179ull }, \ + { { 0 } }, 0 } + +/** + * sha512_update - include some memory in the hash. + * @ctx: the sha512_ctx to use + * @p: pointer to memory, + * @size: the number of bytes pointed to by @p + * + * You can call this multiple times to hash more data, before calling + * sha512_done(). + */ +void sha512_update(struct sha512_ctx *ctx, const void *p, size_t size); + +/** + * sha512_done - finish SHA512 and return the hash + * @ctx: the sha512_ctx to complete + * @res: the hash to return. + * + * Note that @ctx is *destroyed* by this, and must be reinitialized. + * To avoid that, pass a copy instead. + */ +void sha512_done(struct sha512_ctx *sha512, struct sha512 *res); + +/* From sha512.c */ + +/* + * SHA512 core code translated from the Bitcoin project's C++: + * + * src/crypto/sha512.cpp commit f914f1a746d7f91951c1da262a4a749dd3ebfa71 + * Copyright (c) 2014 The Bitcoin Core developers + * Distributed under the MIT software license, see the accompanying + * file COPYING or http://www.opensource.org/licenses/mit-license.php. + */ +/* #include */ +/* #include */ +#include +#include +#include + +static void invalidate_sha512(struct sha512_ctx *ctx) +{ + ctx->bytes = (size_t)-1; +} + +static void check_sha512(struct sha512_ctx *ctx UNUSED) +{ + assert(ctx->bytes != (size_t)-1); +} + +static uint64_t Ch(uint64_t x, uint64_t y, uint64_t z) +{ + return z ^ (x & (y ^ z)); +} +static uint64_t Maj(uint64_t x, uint64_t y, uint64_t z) +{ + return (x & y) | (z & (x | y)); +} +static uint64_t Sigma0(uint64_t x) +{ + return (x >> 28 | x << 36) ^ (x >> 34 | x << 30) ^ (x >> 39 | x << 25); +} +static uint64_t Sigma1(uint64_t x) +{ + return (x >> 14 | x << 50) ^ (x >> 18 | x << 46) ^ (x >> 41 | x << 23); +} +static uint64_t sigma0(uint64_t x) +{ + return (x >> 1 | x << 63) ^ (x >> 8 | x << 56) ^ (x >> 7); +} +static uint64_t sigma1(uint64_t x) +{ + return (x >> 19 | x << 45) ^ (x >> 61 | x << 3) ^ (x >> 6); +} + +/** One round of SHA-512. */ +static void Round(uint64_t a, uint64_t b, uint64_t c, uint64_t *d, uint64_t e, uint64_t f, uint64_t g, uint64_t *h, uint64_t k, uint64_t w) +{ + uint64_t t1 = *h + Sigma1(e) + Ch(e, f, g) + k + w; + uint64_t t2 = Sigma0(a) + Maj(a, b, c); + *d += t1; + *h = t1 + t2; +} + +/** Perform one SHA-512 transformation, processing a 128-byte chunk. */ +static void Transform(uint64_t *s, const uint64_t *chunk) +{ + uint64_t a = s[0], b = s[1], c = s[2], d = s[3], e = s[4], f = s[5], g = s[6], h = s[7]; + uint64_t w0, w1, w2, w3, w4, w5, w6, w7, w8, w9, w10, w11, w12, w13, w14, w15; + + Round(a, b, c, &d, e, f, g, &h, 0x428a2f98d728ae22ull, w0 = be64_to_cpu(chunk[0])); + Round(h, a, b, &c, d, e, f, &g, 0x7137449123ef65cdull, w1 = be64_to_cpu(chunk[1])); + Round(g, h, a, &b, c, d, e, &f, 0xb5c0fbcfec4d3b2full, w2 = be64_to_cpu(chunk[2])); + Round(f, g, h, &a, b, c, d, &e, 0xe9b5dba58189dbbcull, w3 = be64_to_cpu(chunk[3])); + Round(e, f, g, &h, a, b, c, &d, 0x3956c25bf348b538ull, w4 = be64_to_cpu(chunk[4])); + Round(d, e, f, &g, h, a, b, &c, 0x59f111f1b605d019ull, w5 = be64_to_cpu(chunk[5])); + Round(c, d, e, &f, g, h, a, &b, 0x923f82a4af194f9bull, w6 = be64_to_cpu(chunk[6])); + Round(b, c, d, &e, f, g, h, &a, 0xab1c5ed5da6d8118ull, w7 = be64_to_cpu(chunk[7])); + Round(a, b, c, &d, e, f, g, &h, 0xd807aa98a3030242ull, w8 = be64_to_cpu(chunk[8])); + Round(h, a, b, &c, d, e, f, &g, 0x12835b0145706fbeull, w9 = be64_to_cpu(chunk[9])); + Round(g, h, a, &b, c, d, e, &f, 0x243185be4ee4b28cull, w10 = be64_to_cpu(chunk[10])); + Round(f, g, h, &a, b, c, d, &e, 0x550c7dc3d5ffb4e2ull, w11 = be64_to_cpu(chunk[11])); + Round(e, f, g, &h, a, b, c, &d, 0x72be5d74f27b896full, w12 = be64_to_cpu(chunk[12])); + Round(d, e, f, &g, h, a, b, &c, 0x80deb1fe3b1696b1ull, w13 = be64_to_cpu(chunk[13])); + Round(c, d, e, &f, g, h, a, &b, 0x9bdc06a725c71235ull, w14 = be64_to_cpu(chunk[14])); + Round(b, c, d, &e, f, g, h, &a, 0xc19bf174cf692694ull, w15 = be64_to_cpu(chunk[15])); + + Round(a, b, c, &d, e, f, g, &h, 0xe49b69c19ef14ad2ull, w0 += sigma1(w14) + w9 + sigma0(w1)); + Round(h, a, b, &c, d, e, f, &g, 0xefbe4786384f25e3ull, w1 += sigma1(w15) + w10 + sigma0(w2)); + Round(g, h, a, &b, c, d, e, &f, 0x0fc19dc68b8cd5b5ull, w2 += sigma1(w0) + w11 + sigma0(w3)); + Round(f, g, h, &a, b, c, d, &e, 0x240ca1cc77ac9c65ull, w3 += sigma1(w1) + w12 + sigma0(w4)); + Round(e, f, g, &h, a, b, c, &d, 0x2de92c6f592b0275ull, w4 += sigma1(w2) + w13 + sigma0(w5)); + Round(d, e, f, &g, h, a, b, &c, 0x4a7484aa6ea6e483ull, w5 += sigma1(w3) + w14 + sigma0(w6)); + Round(c, d, e, &f, g, h, a, &b, 0x5cb0a9dcbd41fbd4ull, w6 += sigma1(w4) + w15 + sigma0(w7)); + Round(b, c, d, &e, f, g, h, &a, 0x76f988da831153b5ull, w7 += sigma1(w5) + w0 + sigma0(w8)); + Round(a, b, c, &d, e, f, g, &h, 0x983e5152ee66dfabull, w8 += sigma1(w6) + w1 + sigma0(w9)); + Round(h, a, b, &c, d, e, f, &g, 0xa831c66d2db43210ull, w9 += sigma1(w7) + w2 + sigma0(w10)); + Round(g, h, a, &b, c, d, e, &f, 0xb00327c898fb213full, w10 += sigma1(w8) + w3 + sigma0(w11)); + Round(f, g, h, &a, b, c, d, &e, 0xbf597fc7beef0ee4ull, w11 += sigma1(w9) + w4 + sigma0(w12)); + Round(e, f, g, &h, a, b, c, &d, 0xc6e00bf33da88fc2ull, w12 += sigma1(w10) + w5 + sigma0(w13)); + Round(d, e, f, &g, h, a, b, &c, 0xd5a79147930aa725ull, w13 += sigma1(w11) + w6 + sigma0(w14)); + Round(c, d, e, &f, g, h, a, &b, 0x06ca6351e003826full, w14 += sigma1(w12) + w7 + sigma0(w15)); + Round(b, c, d, &e, f, g, h, &a, 0x142929670a0e6e70ull, w15 += sigma1(w13) + w8 + sigma0(w0)); + + Round(a, b, c, &d, e, f, g, &h, 0x27b70a8546d22ffcull, w0 += sigma1(w14) + w9 + sigma0(w1)); + Round(h, a, b, &c, d, e, f, &g, 0x2e1b21385c26c926ull, w1 += sigma1(w15) + w10 + sigma0(w2)); + Round(g, h, a, &b, c, d, e, &f, 0x4d2c6dfc5ac42aedull, w2 += sigma1(w0) + w11 + sigma0(w3)); + Round(f, g, h, &a, b, c, d, &e, 0x53380d139d95b3dfull, w3 += sigma1(w1) + w12 + sigma0(w4)); + Round(e, f, g, &h, a, b, c, &d, 0x650a73548baf63deull, w4 += sigma1(w2) + w13 + sigma0(w5)); + Round(d, e, f, &g, h, a, b, &c, 0x766a0abb3c77b2a8ull, w5 += sigma1(w3) + w14 + sigma0(w6)); + Round(c, d, e, &f, g, h, a, &b, 0x81c2c92e47edaee6ull, w6 += sigma1(w4) + w15 + sigma0(w7)); + Round(b, c, d, &e, f, g, h, &a, 0x92722c851482353bull, w7 += sigma1(w5) + w0 + sigma0(w8)); + Round(a, b, c, &d, e, f, g, &h, 0xa2bfe8a14cf10364ull, w8 += sigma1(w6) + w1 + sigma0(w9)); + Round(h, a, b, &c, d, e, f, &g, 0xa81a664bbc423001ull, w9 += sigma1(w7) + w2 + sigma0(w10)); + Round(g, h, a, &b, c, d, e, &f, 0xc24b8b70d0f89791ull, w10 += sigma1(w8) + w3 + sigma0(w11)); + Round(f, g, h, &a, b, c, d, &e, 0xc76c51a30654be30ull, w11 += sigma1(w9) + w4 + sigma0(w12)); + Round(e, f, g, &h, a, b, c, &d, 0xd192e819d6ef5218ull, w12 += sigma1(w10) + w5 + sigma0(w13)); + Round(d, e, f, &g, h, a, b, &c, 0xd69906245565a910ull, w13 += sigma1(w11) + w6 + sigma0(w14)); + Round(c, d, e, &f, g, h, a, &b, 0xf40e35855771202aull, w14 += sigma1(w12) + w7 + sigma0(w15)); + Round(b, c, d, &e, f, g, h, &a, 0x106aa07032bbd1b8ull, w15 += sigma1(w13) + w8 + sigma0(w0)); + + Round(a, b, c, &d, e, f, g, &h, 0x19a4c116b8d2d0c8ull, w0 += sigma1(w14) + w9 + sigma0(w1)); + Round(h, a, b, &c, d, e, f, &g, 0x1e376c085141ab53ull, w1 += sigma1(w15) + w10 + sigma0(w2)); + Round(g, h, a, &b, c, d, e, &f, 0x2748774cdf8eeb99ull, w2 += sigma1(w0) + w11 + sigma0(w3)); + Round(f, g, h, &a, b, c, d, &e, 0x34b0bcb5e19b48a8ull, w3 += sigma1(w1) + w12 + sigma0(w4)); + Round(e, f, g, &h, a, b, c, &d, 0x391c0cb3c5c95a63ull, w4 += sigma1(w2) + w13 + sigma0(w5)); + Round(d, e, f, &g, h, a, b, &c, 0x4ed8aa4ae3418acbull, w5 += sigma1(w3) + w14 + sigma0(w6)); + Round(c, d, e, &f, g, h, a, &b, 0x5b9cca4f7763e373ull, w6 += sigma1(w4) + w15 + sigma0(w7)); + Round(b, c, d, &e, f, g, h, &a, 0x682e6ff3d6b2b8a3ull, w7 += sigma1(w5) + w0 + sigma0(w8)); + Round(a, b, c, &d, e, f, g, &h, 0x748f82ee5defb2fcull, w8 += sigma1(w6) + w1 + sigma0(w9)); + Round(h, a, b, &c, d, e, f, &g, 0x78a5636f43172f60ull, w9 += sigma1(w7) + w2 + sigma0(w10)); + Round(g, h, a, &b, c, d, e, &f, 0x84c87814a1f0ab72ull, w10 += sigma1(w8) + w3 + sigma0(w11)); + Round(f, g, h, &a, b, c, d, &e, 0x8cc702081a6439ecull, w11 += sigma1(w9) + w4 + sigma0(w12)); + Round(e, f, g, &h, a, b, c, &d, 0x90befffa23631e28ull, w12 += sigma1(w10) + w5 + sigma0(w13)); + Round(d, e, f, &g, h, a, b, &c, 0xa4506cebde82bde9ull, w13 += sigma1(w11) + w6 + sigma0(w14)); + Round(c, d, e, &f, g, h, a, &b, 0xbef9a3f7b2c67915ull, w14 += sigma1(w12) + w7 + sigma0(w15)); + Round(b, c, d, &e, f, g, h, &a, 0xc67178f2e372532bull, w15 += sigma1(w13) + w8 + sigma0(w0)); + + Round(a, b, c, &d, e, f, g, &h, 0xca273eceea26619cull, w0 += sigma1(w14) + w9 + sigma0(w1)); + Round(h, a, b, &c, d, e, f, &g, 0xd186b8c721c0c207ull, w1 += sigma1(w15) + w10 + sigma0(w2)); + Round(g, h, a, &b, c, d, e, &f, 0xeada7dd6cde0eb1eull, w2 += sigma1(w0) + w11 + sigma0(w3)); + Round(f, g, h, &a, b, c, d, &e, 0xf57d4f7fee6ed178ull, w3 += sigma1(w1) + w12 + sigma0(w4)); + Round(e, f, g, &h, a, b, c, &d, 0x06f067aa72176fbaull, w4 += sigma1(w2) + w13 + sigma0(w5)); + Round(d, e, f, &g, h, a, b, &c, 0x0a637dc5a2c898a6ull, w5 += sigma1(w3) + w14 + sigma0(w6)); + Round(c, d, e, &f, g, h, a, &b, 0x113f9804bef90daeull, w6 += sigma1(w4) + w15 + sigma0(w7)); + Round(b, c, d, &e, f, g, h, &a, 0x1b710b35131c471bull, w7 += sigma1(w5) + w0 + sigma0(w8)); + Round(a, b, c, &d, e, f, g, &h, 0x28db77f523047d84ull, w8 += sigma1(w6) + w1 + sigma0(w9)); + Round(h, a, b, &c, d, e, f, &g, 0x32caab7b40c72493ull, w9 += sigma1(w7) + w2 + sigma0(w10)); + Round(g, h, a, &b, c, d, e, &f, 0x3c9ebe0a15c9bebcull, w10 += sigma1(w8) + w3 + sigma0(w11)); + Round(f, g, h, &a, b, c, d, &e, 0x431d67c49c100d4cull, w11 += sigma1(w9) + w4 + sigma0(w12)); + Round(e, f, g, &h, a, b, c, &d, 0x4cc5d4becb3e42b6ull, w12 += sigma1(w10) + w5 + sigma0(w13)); + Round(d, e, f, &g, h, a, b, &c, 0x597f299cfc657e2aull, w13 += sigma1(w11) + w6 + sigma0(w14)); + Round(c, d, e, &f, g, h, a, &b, 0x5fcb6fab3ad6faecull, w14 + sigma1(w12) + w7 + sigma0(w15)); + Round(b, c, d, &e, f, g, h, &a, 0x6c44198c4a475817ull, w15 + sigma1(w13) + w8 + sigma0(w0)); + + s[0] += a; + s[1] += b; + s[2] += c; + s[3] += d; + s[4] += e; + s[5] += f; + s[6] += g; + s[7] += h; +} + +static bool alignment_ok(const void *p UNUSED, size_t n UNUSED) +{ +#if HAVE_UNALIGNED_ACCESS + return true; +#else + return ((size_t)p % n == 0); +#endif +} + +static void add(struct sha512_ctx *ctx, const void *p, size_t len) +{ + const unsigned char *data = p; + size_t bufsize = ctx->bytes % 128; + + if (bufsize + len >= 128) { + /* Fill the buffer, and process it. */ + memcpy(ctx->buf.u8 + bufsize, data, 128 - bufsize); + ctx->bytes += 128 - bufsize; + data += 128 - bufsize; + len -= 128 - bufsize; + Transform(ctx->s, ctx->buf.u64); + bufsize = 0; + } + + while (len >= 128) { + /* Process full chunks directly from the source. */ + if (alignment_ok(data, sizeof(uint64_t))) + Transform(ctx->s, (const uint64_t *)data); + else { + memcpy(ctx->buf.u8, data, sizeof(ctx->buf)); + Transform(ctx->s, ctx->buf.u64); + } + ctx->bytes += 128; + data += 128; + len -= 128; + } + + if (len) { + /* Fill the buffer with what remains. */ + memcpy(ctx->buf.u8 + bufsize, data, len); + ctx->bytes += len; + } +} + +void sha512_init(struct sha512_ctx *ctx) +{ + struct sha512_ctx init = SHA512_INIT; + *ctx = init; +} + +void sha512_update(struct sha512_ctx *ctx, const void *p, size_t size) +{ + check_sha512(ctx); + add(ctx, p, size); +} + +void sha512_done(struct sha512_ctx *ctx, struct sha512 *res) +{ + static const unsigned char pad[128] = { 0x80 }; + uint64_t sizedesc[2] = { 0, 0 }; + size_t i; + + sizedesc[1] = cpu_to_be64((uint64_t)ctx->bytes << 3); + + /* Add '1' bit to terminate, then all 0 bits, up to next block - 16. */ + add(ctx, pad, 1 + ((256 - 16 - (ctx->bytes % 128) - 1) % 128)); + /* Add number of bits of data (big endian) */ + add(ctx, sizedesc, sizeof(sizedesc)); + for (i = 0; i < sizeof(ctx->s) / sizeof(ctx->s[0]); i++) + res->u.u64[i] = cpu_to_be64(ctx->s[i]); + invalidate_sha512(ctx); +} + +void sha512(struct sha512 *sha, const void *p, size_t size) +{ + struct sha512_ctx ctx; + + sha512_init(&ctx); + sha512_update(&ctx, p, size); + sha512_done(&ctx, sha); +} + +/* From hex.h */ +/** + * hex_decode - Unpack a hex string. + * @str: the hexidecimal string + * @slen: the length of @str + * @buf: the buffer to write the data into + * @bufsize: the length of @buf + * + * Returns false if there are any characters which aren't 0-9, a-f or A-F, + * of the string wasn't the right length for @bufsize. + * + * Example: + * unsigned char data[20]; + * + * if (!hex_decode(argv[1], strlen(argv[1]), data, 20)) + * printf("String is malformed!\n"); + */ +bool hex_decode(const char *str, size_t slen, void *buf, size_t bufsize); + +/** + * hex_encode - Create a nul-terminated hex string + * @buf: the buffer to read the data from + * @bufsize: the length of @buf + * @dest: the string to fill + * @destsize: the max size of the string + * + * Returns true if the string, including terminator, fit in @destsize; + * + * Example: + * unsigned char buf[] = { 0x1F, 0x2F }; + * char str[5]; + * + * if (!hex_encode(buf, sizeof(buf), str, sizeof(str))) + * abort(); + */ +bool hex_encode(const void *buf, size_t bufsize, char *dest, size_t destsize); + +/** + * hex_str_size - Calculate how big a nul-terminated hex string is + * @bytes: bytes of data to represent + * + * Example: + * unsigned char buf[] = { 0x1F, 0x2F }; + * char str[hex_str_size(sizeof(buf))]; + * + * hex_encode(buf, sizeof(buf), str, sizeof(str)); + */ +static inline size_t hex_str_size(size_t bytes) +{ + return 2 * bytes + 1; +} + +/* From hex.c */ +static bool char_to_hex(unsigned char *val, char c) +{ + if (c >= '0' && c <= '9') { + *val = c - '0'; + return true; + } + if (c >= 'a' && c <= 'f') { + *val = c - 'a' + 10; + return true; + } + if (c >= 'A' && c <= 'F') { + *val = c - 'A' + 10; + return true; + } + return false; +} + +bool hex_decode(const char *str, size_t slen, void *buf, size_t bufsize) +{ + unsigned char v1, v2; + unsigned char *p = buf; + + while (slen > 1) { + if (!char_to_hex(&v1, str[0]) || !char_to_hex(&v2, str[1])) + return false; + if (!bufsize) + return false; + *(p++) = (v1 << 4) | v2; + str += 2; + slen -= 2; + bufsize--; + } + return slen == 0 && bufsize == 0; +} + +static char hexchar(unsigned int val) +{ + if (val < 10) + return '0' + val; + if (val < 16) + return 'a' + val - 10; + abort(); +} + +bool hex_encode(const void *buf, size_t bufsize, char *dest, size_t destsize) +{ + size_t i; + + if (destsize < hex_str_size(bufsize)) + return false; + + for (i = 0; i < bufsize; i++) { + unsigned int c = ((const unsigned char *)buf)[i]; + *(dest++) = hexchar(c >> 4); + *(dest++) = hexchar(c & 0xF); + } + *dest = '\0'; + + return true; +} + +/* From tap.h */ +/** + * plan_tests - announce the number of tests you plan to run + * @tests: the number of tests + * + * This should be the first call in your test program: it allows tracing + * of failures which mean that not all tests are run. + * + * If you don't know how many tests will actually be run, assume all of them + * and use skip() if you don't actually run some tests. + * + * Example: + * plan_tests(13); + */ +void plan_tests(unsigned int tests); + +/** + * ok1 - Simple conditional test + * @e: the expression which we expect to be true. + * + * This is the simplest kind of test: if the expression is true, the + * test passes. The name of the test which is printed will simply be + * file name, line number, and the expression itself. + * + * Example: + * ok1(somefunc() == 1); + */ +# define ok1(e) ((e) ? \ + _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \ + _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e)) + +/** + * exit_status - the value that main should return. + * + * For maximum compatibility your test program should return a particular exit + * code (ie. 0 if all tests were run, and every test which was expected to + * succeed succeeded). + * + * Example: + * exit(exit_status()); + */ +int exit_status(void); + +/** + * tap_fail_callback - function to call when we fail + * + * This can be used to ease debugging, or exit on the first failure. + */ +void (*tap_fail_callback)(void); + +/* From tap.c */ + +static int no_plan = 0; +static int skip_all = 0; +static int have_plan = 0; +static unsigned int test_count = 0; /* Number of tests that have been run */ +static unsigned int e_tests = 0; /* Expected number of tests to run */ +static unsigned int failures = 0; /* Number of tests that failed */ +static char *todo_msg = NULL; +static const char *todo_msg_fixed = "libtap malloc issue"; +static int todo = 0; +static int test_died = 0; +static int test_pid; + +static void +_expected_tests(unsigned int tests) +{ + printf("1..%d\n", tests); + e_tests = tests; +} + +static void +diagv(const char *fmt, va_list ap) +{ + fputs("# ", stdout); + vfprintf(stdout, fmt, ap); + fputs("\n", stdout); +} + +static void +_diag(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + diagv(fmt, ap); + va_end(ap); +} + +/* + * Generate a test result. + * + * ok -- boolean, indicates whether or not the test passed. + * test_name -- the name of the test, may be NULL + * test_comment -- a comment to print afterwards, may be NULL + */ +unsigned int +_gen_result(int ok, const char *func, const char *file, unsigned int line, + const char *test_name, ...) +{ + va_list ap; + char *local_test_name = NULL; + char *c; + int name_is_digits; + + test_count++; + + /* Start by taking the test name and performing any printf() + expansions on it */ + if(test_name != NULL) { + va_start(ap, test_name); + if (vasprintf(&local_test_name, test_name, ap) < 0) + local_test_name = NULL; + va_end(ap); + + /* Make sure the test name contains more than digits + and spaces. Emit an error message and exit if it + does */ + if(local_test_name) { + name_is_digits = 1; + for(c = local_test_name; *c != '\0'; c++) { + if(!isdigit((unsigned char)*c) + && !isspace((unsigned char)*c)) { + name_is_digits = 0; + break; + } + } + + if(name_is_digits) { + _diag(" You named your test '%s'. You shouldn't use numbers for your test names.", local_test_name); + _diag(" Very confusing."); + } + } + } + + if(!ok) { + printf("not "); + failures++; + } + + printf("ok %d", test_count); + + if(test_name != NULL) { + printf(" - "); + + /* Print the test name, escaping any '#' characters it + might contain */ + if(local_test_name != NULL) { + flockfile(stdout); + for(c = local_test_name; *c != '\0'; c++) { + if(*c == '#') + fputc('\\', stdout); + fputc((int)*c, stdout); + } + funlockfile(stdout); + } else { /* vasprintf() failed, use a fixed message */ + printf("%s", todo_msg_fixed); + } + } + + /* If we're in a todo_start() block then flag the test as being + TODO. todo_msg should contain the message to print at this + point. If it's NULL then asprintf() failed, and we should + use the fixed message. + + This is not counted as a failure, so decrement the counter if + the test failed. */ + if(todo) { + printf(" # TODO %s", todo_msg ? todo_msg : todo_msg_fixed); + if(!ok) + failures--; + } + + printf("\n"); + + if(!ok) + _diag(" Failed %stest (%s:%s() at line %d)", + todo ? "(TODO) " : "", file, func, line); + + free(local_test_name); + + if (!ok && tap_fail_callback) + tap_fail_callback(); + + /* We only care (when testing) that ok is positive, but here we + specifically only want to return 1 or 0 */ + return ok ? 1 : 0; +} + +/* + * Cleanup at the end of the run, produce any final output that might be + * required. + */ +static void +_cleanup(void) +{ + /* If we forked, don't do cleanup in child! */ + if (getpid() != test_pid) + return; + + /* If plan_no_plan() wasn't called, and we don't have a plan, + and we're not skipping everything, then something happened + before we could produce any output */ + if(!no_plan && !have_plan && !skip_all) { + _diag("Looks like your test died before it could output anything."); + return; + } + + if(test_died) { + _diag("Looks like your test died just after %d.", test_count); + return; + } + + + /* No plan provided, but now we know how many tests were run, and can + print the header at the end */ + if(!skip_all && (no_plan || !have_plan)) { + printf("1..%d\n", test_count); + } + + if((have_plan && !no_plan) && e_tests < test_count) { + _diag("Looks like you planned %d tests but ran %d extra.", + e_tests, test_count - e_tests); + return; + } + + if((have_plan || !no_plan) && e_tests > test_count) { + _diag("Looks like you planned %d tests but only ran %d.", + e_tests, test_count); + if(failures) { + _diag("Looks like you failed %d tests of %d run.", + failures, test_count); + } + return; + } + + if(failures) + _diag("Looks like you failed %d tests of %d.", + failures, test_count); + +} + +/* + * Initialise the TAP library. Will only do so once, however many times it's + * called. + */ +static void +_tap_init(void) +{ + static int run_once = 0; + + if(!run_once) { + test_pid = getpid(); + atexit(_cleanup); + + /* stdout needs to be unbuffered so that the output appears + in the same place relative to stderr output as it does + with Test::Harness */ +// setbuf(stdout, 0); + run_once = 1; + } +} + +/* + * Note the number of tests that will be run. + */ +void +plan_tests(unsigned int tests) +{ + + _tap_init(); + + if(have_plan != 0) { + fprintf(stderr, "You tried to plan twice!\n"); + test_died = 1; + exit(255); + } + + if(tests == 0) { + fprintf(stderr, "You said to run 0 tests! You've got to run something.\n"); + test_died = 1; + exit(255); + } + + have_plan = 1; + + _expected_tests(tests); +} + +static int +exit_status_(void) +{ + int r; + + /* If there's no plan, just return the number of failures */ + if(no_plan || !have_plan) { + return failures; + } + + /* Ran too many tests? Return the number of tests that were run + that shouldn't have been */ + if(e_tests < test_count) { + r = test_count - e_tests; + return r; + } + + /* Return the number of tests that failed + the number of tests + that weren't run */ + r = failures + e_tests - test_count; + + return r; +} + +int +exit_status(void) +{ + int r = exit_status_(); + if (r > 255) + r = 255; + return r; +} + +/* From run-test-vectors.c */ + +/* Test vectors. */ +struct test { + const char *vector; + size_t repetitions; + const char *expected; +}; + +static const char ZEROES[] = + "0000000000000000000000000000000000000000000000000000000000000000" + "0000000000000000000000000000000000000000000000000000000000000000"; + +static struct test tests[] = { + /* http://csrc.nist.gov/groups/STM/cavp/secure-hashing.html ShortMsg */ + { "21", 1, + "3831a6a6155e509dee59a7f451eb35324d8f8f2df6e3708894740f98fdee2388" + "9f4de5adb0c5010dfb555cda77c8ab5dc902094c52de3278f35a75ebc25f093a" }, + { "9083", 1, + "55586ebba48768aeb323655ab6f4298fc9f670964fc2e5f2731e34dfa4b0c09e" + "6e1e12e3d7286b3145c61c2047fb1a2a1297f36da64160b31fa4c8c2cddd2fb4" }, + { "0a55db", 1, + "7952585e5330cb247d72bae696fc8a6b0f7d0804577e347d99bc1b11e52f3849" + "85a428449382306a89261ae143c2f3fb613804ab20b42dc097e5bf4a96ef919b" }, + { "23be86d5", 1, + "76d42c8eadea35a69990c63a762f330614a4699977f058adb988f406fb0be8f2" + "ea3dce3a2bbd1d827b70b9b299ae6f9e5058ee97b50bd4922d6d37ddc761f8eb" }, + { "eb0ca946c1", 1, + "d39ecedfe6e705a821aee4f58bfc489c3d9433eb4ac1b03a97e321a2586b40dd" + "0522f40fa5aef36afff591a78c916bfc6d1ca515c4983dd8695b1ec7951d723e" }, + { "38667f39277b", 1, + "85708b8ff05d974d6af0801c152b95f5fa5c06af9a35230c5bea2752f031f9bd" + "84bd844717b3add308a70dc777f90813c20b47b16385664eefc88449f04f2131" }, + { "b39f71aaa8a108", 1, + "258b8efa05b4a06b1e63c7a3f925c5ef11fa03e3d47d631bf4d474983783d8c0" + "b09449009e842fc9fa15de586c67cf8955a17d790b20f41dadf67ee8cdcdfce6" }, + { "dc28484ebfd293d62ac759d5754bdf502423e4d419fa79020805134b2ce3dff7" + "38c7556c91d810adbad8dd210f041296b73c2185d4646c97fc0a5b69ed49ac8c" + "7ced0bd1cfd7e3c3cca47374d189247da6811a40b0ab097067ed4ad40ade2e47" + "91e39204e398b3204971445822a1be0dd93af8", 1, + "615115d2e8b62e345adaa4bdb95395a3b4fe27d71c4a111b86c1841463c5f03d" + "6b20d164a39948ab08ae060720d05c10f6022e5c8caf2fa3bca2e04d9c539ded" }, + { "fd2203e467574e834ab07c9097ae164532f24be1eb5d88f1af7748ceff0d2c67" + "a21f4e4097f9d3bb4e9fbf97186e0db6db0100230a52b453d421f8ab9c9a6043" + "aa3295ea20d2f06a2f37470d8a99075f1b8a8336f6228cf08b5942fc1fb4299c" + "7d2480e8e82bce175540bdfad7752bc95b577f229515394f3ae5cec870a4b2f8", + 1, + "a21b1077d52b27ac545af63b32746c6e3c51cb0cb9f281eb9f3580a6d4996d5c" + "9917d2a6e484627a9d5a06fa1b25327a9d710e027387fc3e07d7c4d14c6086cc" }, + /* http://www.di-mgt.com.au/sha_testvectors.html */ + { ZEROES, 1, + "7be9fda48f4179e611c698a73cff09faf72869431efee6eaad14de0cb44bbf66" + "503f752b7a8eb17083355f3ce6eb7d2806f236b25af96a24e22b887405c20081" } +}; + +static void *xmalloc(size_t size) +{ + char * ret; + ret = malloc(size); + if (ret == NULL) { + perror("malloc"); + abort(); + } + return ret; +} + +static bool do_test(const struct test *t) +{ + struct sha512 h; + char got[128 + 1]; + bool passed; + size_t i, vector_len = strlen(t->vector) / 2; + void *vector = xmalloc(vector_len); + + hex_decode(t->vector, vector_len * 2, vector, vector_len); + + for (i = 0; i < t->repetitions; i++) { + sha512(&h, vector, vector_len); + if (t->repetitions > 1) + memcpy(vector, &h, sizeof(h)); + } + + hex_encode(&h, sizeof(h), got, sizeof(got)); + + passed = strcmp(t->expected, got) == 0; + free(vector); + return passed; +} + +int main(void) +{ + const size_t num_tests = sizeof(tests) / sizeof(tests[0]); + size_t i; + + /* This is how many tests you plan to run */ + plan_tests(num_tests); + + for (i = 0; i < num_tests; i++) + ok1(do_test(&tests[i])); + + /* This exits depending on whether all tests passed */ + return exit_status(); +} From patchwork Fri Feb 25 17:20:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545907 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp508984imf; Fri, 25 Feb 2022 09:46:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmkz8yMKhTkoXCD+krx2Rz9Fn7TJ+Qcq3EXt0WE6ym72ZRpLsbbQVuvK4zXhbP2tO4hTn9 X-Received: by 2002:a25:be88:0:b0:620:e67:4302 with SMTP id i8-20020a25be88000000b006200e674302mr8297333ybk.120.1645811207698; Fri, 25 Feb 2022 09:46:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811207; cv=none; d=google.com; s=arc-20160816; b=eafSRUzYNqph/HWybcwtJKLImjyzgjbnlALMZttyQIHnAbk0Vjih4moxsBPyn1xwfW HPTzMZJg3B/3ThDpTjIVu1LIF5IaEDQvmXmnpG7CDqAL6cgvysMcAVvejyvO5Mds9czt 1vvIRHKm8VUpijxHcRJBUUluj2nQLCs60n+6/S6S/tzEhUD8/a9xD+57fBbII4gUYaX6 /s+GgAZWYTaBGiwn0aNknXeCdtYjNM3Yb1HjJoglOalQG3gcFH42MXpyEVGKdOMC0XZS IZFJoq5wjdwWf066Bzb/gqLO3Oha129fzuGlVOSVaV2BReCS9wkWFgiOnV7Mwc6V7yuC 0rnQ== 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=kk3Oune+gYEbeOEMjHfa4vIyU98YLuRUzQb5fhro0RQ=; b=dMgfvHl1W5WJKGk92UShiDZkTQNeMwxyUrtTEqw5Ok8EI3l0064mDZ/Wvomg+dIwhx F9axdVzmdquZllQGbpVcsFkNlyT2aaaxiy8E77YxwNQpbjXa/kIzh5aaWtoKmhord1rB +DqbKHIwzVLN/sVVpuFdxk4WiY/h7HQFXmfFnjf2WtnQuf17Bq8t2KWetP8ekc+JE1Jw oygH3BM4e7xeTQIk8kqELXspAP03yPp12T8FKHsFhtxtOu8RcNo6ZYt9zNMmnwmQq2MS 3h84VX+QIMLqBGBcIt/aPbhIVYD3nbkSXvTNHRwm4IK8th9GEbm/u5u0jkzKfXikN2S8 1XAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oXHwNRbX; 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 p187-20020a255bc4000000b0061db704f884si2803438ybb.403.2022.02.25.09.46.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:46:47 -0800 (PST) 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=oXHwNRbX; 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]:52516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeg3-0005T7-2L for patch@linaro.org; Fri, 25 Feb 2022 12:46:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeH5-0004Jo-UZ for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:59 -0500 Received: from [2a00:1450:4864:20::531] (port=41919 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGp-0002PF-Io for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:59 -0500 Received: by mail-ed1-x531.google.com with SMTP id w3so8328957edu.8 for ; Fri, 25 Feb 2022 09:20:43 -0800 (PST) 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=kk3Oune+gYEbeOEMjHfa4vIyU98YLuRUzQb5fhro0RQ=; b=oXHwNRbXVisRJDmE/+5GQ9b7USWY+WUVKSh7JuXIZ/ifQqCJ9zw0JCng1+fZKbpdNI W0BSTaGj3TGyAO+RCW7Vlt6MocDDpT32kATc1xGMY4I6HI0W00rHXh1kSK02JiNj9giz HQDpPoasCHPktpGV8bnFqbmZD0KJp/e+JM5a5A2SLgjMBjIcYVR4pW8jEr3+cGcpRlN1 0E9IT5s+lLx7jh30P2q+P+A/PuihUSVt7DUbPQk9wzR6vpWj+WB2YH1N1F4pDhA92K3P UXe4BuWUdpj8SLjZj67DIanWIafi/qL3dhZ33wI15GvG0UkgB4X/KyHi8fcCQn4maP9S joIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kk3Oune+gYEbeOEMjHfa4vIyU98YLuRUzQb5fhro0RQ=; b=QP/VjnP0I778RqXHGIz/ZfKReMeeY0bWFwrwpmA3Q1lRvwwmFnXoVLzHKpA6Td0VF2 VOj83dC82Y1QlFoIorqffUL0sg4+O4oDLLOtb4z3SUDniKzsfMWCN4fXGIXtj+kCtqrM 3uBj6RWVTnn6qcSFfxQjrc4dDTcjJr1cgNEw4u9COWdKww5y7HE6LiukJ4O3svDmtEi5 WX0d8YY0tmttwn5QAOlFjbIOBcwRWdDIez+X3gvim2lYlK+9dUia35rUB7gbVfHZBd9V e4iNaKdTsb+CmyYeDLvHQTZyH6bzNwm4V5rPqWsPcUdFsZnizk+hXy97y1uwT2NX6MIr bpWQ== X-Gm-Message-State: AOAM533T7BpwJacieeQkEy7NFx0AqXUkgrcuzsvkS0XJ8UmValGf+9kW 5eA45OZuFjEf5veluks03qQqtQ== X-Received: by 2002:a50:c346:0:b0:413:4750:b36a with SMTP id q6-20020a50c346000000b004134750b36amr7921024edb.433.1645809642220; Fri, 25 Feb 2022 09:20:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id ec21-20020a170906b6d500b006d170a3444csm1225915ejb.164.2022.02.25.09.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:38 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4DF2D1FFC5; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 13/18] tests/tcg: add vectorised sha512 versions Date: Fri, 25 Feb 2022 17:20:16 +0000 Message-Id: <20220225172021.3493923-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x531.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , berrange@redhat.com, David Hildenbrand , sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, Eduardo Habkost , "open list:S390 TCG CPUs" , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This builds vectorised versions of sha512 to exercise the vector code: - aarch64 (AdvSimd) - i386 (SSE) - s390x (MVX) - ppc64/ppc64le (power10 vectors) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220202191242.652607-5-alex.bennee@linaro.org> Message-Id: <20220211160309.335014-12-alex.bennee@linaro.org> --- v2 - expanded to include both flavours of ppc64 --- tests/tcg/aarch64/Makefile.target | 7 +++++++ tests/tcg/arm/Makefile.target | 8 ++++++++ tests/tcg/i386/Makefile.target | 6 ++++++ tests/tcg/ppc64/Makefile.target | 9 ++++++++- tests/tcg/ppc64le/Makefile.target | 9 ++++++++- tests/tcg/s390x/Makefile.target | 9 +++++++++ tests/tcg/x86_64/Makefile.target | 7 +++++++ 7 files changed, 53 insertions(+), 2 deletions(-) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index df3f8e9438..ac07acde66 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -60,6 +60,13 @@ run-sha1-vector: sha1-vector run-sha1 TESTS += sha1-vector +# Vector versions of sha512 (-O3 triggers vectorisation) +sha512-vector: CFLAGS=-O3 +sha512-vector: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +TESTS += sha512-vector + ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index 2dc94931c3..2f815120a5 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -79,6 +79,14 @@ run-sha1-vector: sha1-vector run-sha1 $(call diff-out, sha1-vector, sha1.out) ARM_TESTS += sha1-vector + +# Vector versions of sha512 (-O3 triggers vectorisation) +sha512-vector: CFLAGS=-O3 +sha512-vector: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +ARM_TESTS += sha512-vector + TESTS += $(ARM_TESTS) # On ARM Linux only supports 4k pages diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index 38c10379af..099556efdc 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -71,3 +71,9 @@ TESTS=$(MULTIARCH_TESTS) $(I386_TESTS) # On i386 and x86_64 Linux only supports 4k pages (large pages are a different hack) EXTRA_RUNS+=run-test-mmap-4096 + +sha512-sse: CFLAGS=-msse4.1 -O3 +sha512-sse: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +TESTS+=sha512-sse diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target index 9d6dfc1e26..c9498053df 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -13,12 +13,19 @@ $(PPC64_TESTS): CFLAGS += -mpower8-vector PPC64_TESTS += mtfsf ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) -PPC64_TESTS += byte_reverse +PPC64_TESTS += byte_reverse sha512-vector endif byte_reverse: CFLAGS += -mcpu=power10 run-byte_reverse: QEMU_OPTS+=-cpu POWER10 run-plugin-byte_reverse-with-%: QEMU_OPTS+=-cpu POWER10 +sha512-vector: CFLAGS +=-mcpu=power10 -O3 +sha512-vector: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +run-sha512-vector: QEMU_OPTS+=-cpu POWER10 +run-plugin-sha512-vector-with-%: QEMU_OPTS+=-cpu POWER10 + PPC64_TESTS += signal_save_restore_xer TESTS += $(PPC64_TESTS) diff --git a/tests/tcg/ppc64le/Makefile.target b/tests/tcg/ppc64le/Makefile.target index 480ff0898d..12d85e946b 100644 --- a/tests/tcg/ppc64le/Makefile.target +++ b/tests/tcg/ppc64le/Makefile.target @@ -10,12 +10,19 @@ endif $(PPC64LE_TESTS): CFLAGS += -mpower8-vector ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) -PPC64LE_TESTS += byte_reverse +PPC64LE_TESTS += byte_reverse sha512-vector endif byte_reverse: CFLAGS += -mcpu=power10 run-byte_reverse: QEMU_OPTS+=-cpu POWER10 run-plugin-byte_reverse-with-%: QEMU_OPTS+=-cpu POWER10 +sha512-vector: CFLAGS +=-mcpu=power10 -O3 +sha512-vector: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +run-sha512-vector: QEMU_OPTS+=-cpu POWER10 +run-plugin-sha512-vector-with-%: QEMU_OPTS+=-cpu POWER10 + PPC64LE_TESTS += mtfsf PPC64LE_TESTS += signal_save_restore_xer diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 1a7238b4eb..e53b599b22 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -25,3 +25,12 @@ run-gdbstub-signals-s390x: signals-s390x EXTRA_RUNS += run-gdbstub-signals-s390x endif + +# MVX versions of sha512 +sha512-mvx: CFLAGS=-march=z13 -mvx -O3 +sha512-mvx: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +run-sha512-mvx: QEMU_OPTS+=-cpu max + +TESTS+=sha512-mvx diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target index 4a8a464c57..17cf168f0a 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -22,3 +22,10 @@ test-x86_64: test-i386.c test-i386.h test-i386-shift.h test-i386-muldiv.h vsyscall: $(SRC_PATH)/tests/tcg/x86_64/vsyscall.c $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + +# TCG does not yet support all SSE (SIGILL on pshufb) +# sha512-sse: CFLAGS=-march=core2 -O3 +# sha512-sse: sha512.c +# $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +TESTS+=sha512-sse From patchwork Fri Feb 25 17:20:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545912 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp516377imf; Fri, 25 Feb 2022 09:57:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5Qt6+Llmg4ObNINzMpZXCTKSqmaW/31U8OgbfcQgQj96ZlhsKOZ/9VxZxp4M7gTXmBUkk X-Received: by 2002:a25:2551:0:b0:613:2017:b879 with SMTP id l78-20020a252551000000b006132017b879mr8300740ybl.557.1645811833391; Fri, 25 Feb 2022 09:57:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811833; cv=none; d=google.com; s=arc-20160816; b=08NkJ+5UMgKht/jAxLzK5uR1uJyVo//Mc7rORFKXgj8nc1OA4+G9Wq38xjwruxR/s1 ST/xKGUThgPXr8Nm/Fz9agIylEPXHw/Z/DD0ZWSAgWDR//drnbBIyE1wT9FoXneLIeFb hao7aETuv778Uvrkab/5q9U2djPxIr5mOlcLVwcDg2ac3RCYyT/m8I6WNctPP/402G5s t6ZwO0oPqcxU4mZag3VwmvIAoaPFZOD8sxtV5ehK8GjZLJZwkoi+NCmB56C/GTcT1hKr Ejw5DYAr5zGsqevtM2i0gqxgXNKOAZvNYlSapCrzlsHFOKJsm7ljJCy9/PdVEjznD2uH /Tdg== 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=o5SIw7t9pKeEYOX/Stnikqz/Ht/WWQptkfxwqxvKhEE=; b=d7iV9QN4mblj/0KoJVNc83RJ5PeLRFQXASe9fdlXL7WHnu82oulcZFrHJ5itZPz+2d 1+FNV91FA5OZti+nlVvpJrIDIJKmfHjFDq22P1/aNTkU+dsJnBCMzpafwTZ5GXUgP+mn HN8Zm+X/x2IwQiwfAwLbHqxFlOyMOtZSdNmvrwQ2q1Qqn3/wFn5mhhercYYJaYnfXm6F 7OhcO/zHEf/64io2pXb+CGRaGwuPupUPlZWMhmDGRqy3R+vGo0FfLoMXvyaOHu11zQWf 962UReTAIB0W4Orp1anViPH5tICR4d5sZN5UfMFq68/STgPTUNbSyVhcj6yYhz4cugd4 ppwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=f3W0gDEH; 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 r11-20020a81c30b000000b002d6272b4019si2525253ywk.243.2022.02.25.09.57.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:57:13 -0800 (PST) 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=f3W0gDEH; 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]:47736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeq8-0004wD-5B for patch@linaro.org; Fri, 25 Feb 2022 12:57:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeH3-0004Ft-UE for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:58 -0500 Received: from [2a00:1450:4864:20::630] (port=44777 helo=mail-ej1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGz-0002QA-3G for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:20:57 -0500 Received: by mail-ej1-x630.google.com with SMTP id p14so12122956ejf.11 for ; Fri, 25 Feb 2022 09:20:45 -0800 (PST) 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=o5SIw7t9pKeEYOX/Stnikqz/Ht/WWQptkfxwqxvKhEE=; b=f3W0gDEHu5jzgvJAyw8hnfDvCzDcMy7XRPZtP7ha2YCeutwxUhgZAb5jRe/w8MnQqb jWb9gERcA3Nzmg4wGVHhsxGugH6y6M/A8y6wKwhqMKcWBcBEeLL4hGvDYEsFgltmTIq7 uTE6Lz1rNqPfxKahawf/KUQJFOp/9rmyAwVEdMeUfOlny3lclhYaq/P6xgzDKCQtobZB MIFUeEQgH230uLQSt9SHVInu+qZIaOUGuCZm6VovrJRlEwHy1HRzme6IVcdVGeX50BXq BxzS6BZuKaMsdu2m3KUwSGTSJb4IYGa71868aaVF+cDLqez8LVoHgMOTmmvzzdamElKq IruQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o5SIw7t9pKeEYOX/Stnikqz/Ht/WWQptkfxwqxvKhEE=; b=HvP8HRpTuTcfSZQ0GTw1HkexjXL/xbWeAvBxmxDLWwvGa0wDOTRAQB81RSCK1gd9Aj cpnfIsJd6BHCQyj3CxYbhgXsCQX5CrlIskAqu9LJZhlzuIWWAiIRJrOC8E6k6BQjbogy ruNYZ03nGLcANUd3O7S4Ma9MOOn5ptOtOP6JtkziMSz5mvqT9P7dUlT/icPRmEPatVoV yEYuzyXTfiC4qivPs+H9ga2AmR1O9f/8IPlt7NnkRzDZzzOELii6Gn8WOeT9Ns6oeNWb Vuxxec4UyLqeaPqSRXChY8hcQpHnJWP176nGnbMCJnRAJvNA96no/NCnL8M/gKkESJUJ eUdQ== X-Gm-Message-State: AOAM531IE1TmEPHiKpBKp8VJR9L/xzbmtAhEv+o1GVxo5NjGy/W1WKiO s/x/p5ofNflTJJtEV/6Sh/sk0Q== X-Received: by 2002:a17:906:3ac7:b0:6ce:c3a1:3dcf with SMTP id z7-20020a1709063ac700b006cec3a13dcfmr6869625ejd.182.1645809645029; Fri, 25 Feb 2022 09:20:45 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bd3-20020a056402206300b00410a4ac2802sm1597170edb.66.2022.02.25.09.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:38 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 648D61FFC6; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/18] travis.yml: Update the s390x jobs to Ubuntu Focal Date: Fri, 25 Feb 2022 17:20:17 +0000 Message-Id: <20220225172021.3493923-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, Cornelia Huck , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , "open list:S390 general arch..." , qemu-arm@nongnu.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: Thomas Huth QEMU will soon drop the support for Ubuntu 18.04, so let's update the Travis jobs that were still using this version to 20.04 instead. While we're at it, also remove an obsolete comment about Ubuntu Xenial being the default for our Travis jobs. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20220221153423.1028465-1-thuth@redhat.com> Reviewed-by: Richard Henderson --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41010ebe6b..c3c8048842 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,3 @@ -# The current Travis default is a VM based 16.04 Xenial on GCE -# Additional builds with specific requirements for a full VM need to -# be added as additional matrix: entries later on os: linux dist: focal language: c @@ -190,7 +187,7 @@ jobs: - name: "[s390x] GCC check-tcg" arch: s390x - dist: bionic + dist: focal addons: apt_packages: - libaio-dev @@ -233,7 +230,7 @@ jobs: - name: "[s390x] GCC (other-softmmu)" arch: s390x - dist: bionic + dist: focal addons: apt_packages: - libaio-dev @@ -263,10 +260,11 @@ jobs: - name: "[s390x] GCC (user)" arch: s390x - dist: bionic + dist: focal addons: apt_packages: - libgcrypt20-dev + - libglib2.0-dev - libgnutls28-dev - ninja-build env: @@ -274,7 +272,7 @@ jobs: - name: "[s390x] Clang (disable-tcg)" arch: s390x - dist: bionic + dist: focal compiler: clang addons: apt_packages: From patchwork Fri Feb 25 17:20:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545908 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp509632imf; Fri, 25 Feb 2022 09:47:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCujQcG+lwyShj5/O7GPJH7em73rJ/6lWkalhAZQJW+l8gUU1ZyfD+sa/DUe/VGOivKm2X X-Received: by 2002:a25:c64a:0:b0:61d:9053:ba62 with SMTP id k71-20020a25c64a000000b0061d9053ba62mr8562741ybf.304.1645811263728; Fri, 25 Feb 2022 09:47:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811263; cv=none; d=google.com; s=arc-20160816; b=XOlgfZClaYrDAX+JVRFFzelBA80+Ru4n8gSNyIDoBW4TiXACD/wLPeU3KHB2F92tBQ 5/KuiKLf/VksJMJEnz4OGt/5DDyQrxFopLtFgn8YXlySikt8WKlDhrF2w07cJ93wrFQB nBL1EE5nkmQI7NKZnF8dVE5EUl7mTrhDVOg30mrph+0yuPVNHtGE/kbhUtqLmd9Bd4OJ YdX4A9JjQOpr1AKJnwkoV9PRuiRWvw2dlrIpdkLhhSwJlwwQceqJz4l58lf1U0gymyee fOWZJTwGNWxCSuGfA9vPXmJWx28V5p14fN5TdSPtdagbhKml9Y4h118axkgqrCQrqYcY Qxow== 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=0oBkta3GCwdwLjFZvcNTgip4U0wX9WaLemmg12u8TiI=; b=J27LTm7sq/+XsCry8KtkVmeSC37Yujyj1G6lhOOZgk05B7rDL00eW7E/5GnLy+8jUA vy+sPbJw1BJ6hFVHR5oIWpzrUg0M7Q2lompGIZVC5JEhKLetIX4vOdrBBH5w8Y+tTWmS vOcJdosiyn3VdxBaY8Kxzg4lfbfKPsdRStfzbUoO3m8Vl8/3Wnok+jAg6s3dcsLiVmH9 jfzKe6MqeohDGNYHrOjaZ5iKJa6CPhkoSFeVkuYs+Tj/8dVU2z+RSNcNWKv3CrWxT9MD 6tCOz/I4DaETgwPGhh0zQy6Um4NghiTwf/6rxsYCT8tYdpieZNlnwAcZ79pNc27RiHMv 0c3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eBZr8ppr; 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 j13-20020a5b030d000000b0061212f3e15esi2741445ybp.179.2022.02.25.09.47.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:47:43 -0800 (PST) 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=eBZr8ppr; 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]:54744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNegx-00072V-6N for patch@linaro.org; Fri, 25 Feb 2022 12:47:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeMK-0002oW-AL for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:26:24 -0500 Received: from [2a00:1450:4864:20::52f] (port=40666 helo=mail-ed1-x52f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeMG-0004Hn-Jp for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:26:23 -0500 Received: by mail-ed1-x52f.google.com with SMTP id h15so8361379edv.7 for ; Fri, 25 Feb 2022 09:26:18 -0800 (PST) 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=0oBkta3GCwdwLjFZvcNTgip4U0wX9WaLemmg12u8TiI=; b=eBZr8pprttau3jYTlX1IGwIkU7KvewwCXvkYFUi3gOpuRJ6XHO52nYkjEaq3cPKcje 7tazM4ROG5vDs4Sm7zSLl8fgKoW1Imz+yTwQ6FXAUTww9vynpecH9s+UvoU5sd628CTb UQSHK39rcOcKUeW3zkkqVJLst8kwbB4mVmQ8vIfLAmwmagg7qbPAj9EiygXwE2g07Tvd DFibgeSWP40C+jqiyXaarSdCNJy7fU/xktPvDXSS4i/30grGHnmlQX2ioZMEmLYdNr1n r095Ev77aKHrvYMgteiPHEXWUfHyMJfC5hoaU+4sgg3OWB8Q+vvs6GFecO8z+jQfjBNr Z/9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0oBkta3GCwdwLjFZvcNTgip4U0wX9WaLemmg12u8TiI=; b=y0l1pEe/fm446nd8l/M2B26vJSnV/5dJehsILY/byrjxPR/WcrjaTBFMMLJ7AOfRgn e3lA7VP+BFxL84TFNiBQyk6v7byAystD2oSKqtl5s5wrqi9GqU3bqYAqAtGE83/AviOq zhyiDtyXxU41PgTh811adKR97KS4Ohn41JVD6WsoWNYHREX/lv+UDKGYR5hVEEQBViiO AbSmAW8QlQbvWWdlfAGnBWhpJ+rvYoLt8/6274VDYGTjWUvDl0Q446VbDhUZLJMqJlrm q/D8lfREo0wL8Z61ovGykUDK23+VQ+hX92R7KdYvtxgnKkbHpaqMGk+pbcqIj/ynch8J xdPQ== X-Gm-Message-State: AOAM533/sAqTJMoRDd6iL6HxgEUP0HLpMq9RAZrfbQnqP2Kgk980rb5w IdZXeZZ+qAdzqmfAGWIdjwIodg== X-Received: by 2002:a05:6402:4392:b0:412:ac91:6c70 with SMTP id o18-20020a056402439200b00412ac916c70mr7995577edc.83.1645809977186; Fri, 25 Feb 2022 09:26:17 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id el9-20020a170907284900b006cf8e3c83e3sm1246265ejc.168.2022.02.25.09.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:26:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7345C1FFC7; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/18] gitlab: upgrade the job definition for s390x to 20.04 Date: Fri, 25 Feb 2022 17:20:18 +0000 Message-Id: <20220225172021.3493923-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , Thomas Huth , berrange@redhat.com, Beraldo Leal , sw@weilnetz.de, Cornelia Huck , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , Christian Borntraeger , "open list:S390 general arch..." , qemu-arm@nongnu.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" The new s390x machine has more of everything including the OS. As 18.04 will soon be going we might as well get onto something moderately modern. Signed-off-by: Alex Bennée Acked-by: Christian Borntraeger Reviewed-by: Thomas Huth Acked-by: Cornelia Huck Reviewed-by: Philippe Mathieu-Daudé Cc: Peter Maydell Reviewed-by: Richard Henderson --- .gitlab-ci.d/custom-runners.yml | 2 +- ...18.04-s390x.yml => ubuntu-20.04-s390x.yml} | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) rename .gitlab-ci.d/custom-runners/{ubuntu-18.04-s390x.yml => ubuntu-20.04-s390x.yml} (87%) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 056c374619..3e76a2034a 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -14,6 +14,6 @@ variables: GIT_STRATEGY: clone include: - - local: '/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml' - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml similarity index 87% rename from .gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml rename to .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml index f39d874a1e..0333872113 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -1,12 +1,12 @@ -# All ubuntu-18.04 jobs should run successfully in an environment +# All ubuntu-20.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 20.04/20.04" -ubuntu-18.04-s390x-all-linux-static: +ubuntu-20.04-s390x-all-linux-static: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -21,11 +21,11 @@ ubuntu-18.04-s390x-all-linux-static: - make --output-sync -j`nproc` check V=1 - make --output-sync -j`nproc` check-tcg V=1 -ubuntu-18.04-s390x-all: +ubuntu-20.04-s390x-all: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -37,11 +37,11 @@ ubuntu-18.04-s390x-all: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 -ubuntu-18.04-s390x-alldbg: +ubuntu-20.04-s390x-alldbg: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -58,11 +58,11 @@ ubuntu-18.04-s390x-alldbg: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 -ubuntu-18.04-s390x-clang: +ubuntu-20.04-s390x-clang: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -78,11 +78,11 @@ ubuntu-18.04-s390x-clang: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 -ubuntu-18.04-s390x-tci: +ubuntu-20.04-s390x-tci: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -97,11 +97,11 @@ ubuntu-18.04-s390x-tci: - ../configure --disable-libssh --enable-tcg-interpreter - make --output-sync -j`nproc` -ubuntu-18.04-s390x-notcg: +ubuntu-20.04-s390x-notcg: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' From patchwork Fri Feb 25 17:20:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545910 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp512386imf; Fri, 25 Feb 2022 09:51:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0M7lKePOKbN1deiaplVl5NwYydTdxCAR/f8akTlTFWAcdywQ1CE62psydNiwnxV/V0Njg X-Received: by 2002:a0c:ec04:0:b0:432:274a:a1fe with SMTP id y4-20020a0cec04000000b00432274aa1femr6784066qvo.68.1645811504007; Fri, 25 Feb 2022 09:51:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811504; cv=none; d=google.com; s=arc-20160816; b=SMAVTATIoUj6hObFUeV6/iN8zxdkie6pn+C0xWLt565K02cNaL1PM754ClFWeXKgf0 OKrnpyVSsA3OJLimxbtF0atUBApVRCyai1YWWMB6anI9BMgtRPuUEJ71lWtmDeT1B0eH IHNYoiuuQHm3D3nORvxVHGZGxVAjrTpbfyw07/Mt74CjzsRA3/puoOtrEw6YgFzOAiPI v9fMYf2vN6oBeroSwETH2MNeGKoRxMV+fhaSBaN9jTwllRN44G6x84QBYuBMj7YiFG2P SyDYWiLK3+PlbsKo04dO46ThYEE+qoGYZsJ7p6hq2/Iz6kapbJ0E/SlJWGLfgvdEZJ5N RRug== 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=2OwdBN+L5/lqkl/dGkG5znmi1Vo42mXqN8INjvatReI=; b=GApAhIdgPBt+lnC80rkKHyFHu7sTiyytovW8OFJoqQ0uE5U5JuNTS9ek8rCmu8gWNX bTM9gdUaP4ROJOTyKH/KTXLtJbtkO10s3hYBZ4JC0IlpW3aSb8COrvB6sXQ+Koc9/i3+ XgPADnLpCwhBHUdcIZhfNajABFs9ouiogT/nw7tldlqYLQL7H3LrMB3wPmqHtNnZ3AkM DTwxvnFxA8vMcR/4HvY39dgUfAvautL9RKpSS+bt5e9TxjHWFzwtWqJcsKT6UA8NkxNs m/Z83i0uGmz2t+onsPVnn4/d1OewpyaC4LUVKbSN+vaW+J2U3TQJBWcVGPOoZ0HgyvUN 15/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kagYT9us; 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 s125-20020a375e83000000b0060686ee4abfsi1629117qkb.176.2022.02.25.09.51.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:51:43 -0800 (PST) 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=kagYT9us; 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]:35316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNeko-0004d7-VO for patch@linaro.org; Fri, 25 Feb 2022 12:51:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeML-0002rF-L7 for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:26:25 -0500 Received: from [2a00:1450:4864:20::52d] (port=36596 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeMH-0004IL-KF for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:26:25 -0500 Received: by mail-ed1-x52d.google.com with SMTP id cm8so8390000edb.3 for ; Fri, 25 Feb 2022 09:26:21 -0800 (PST) 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=2OwdBN+L5/lqkl/dGkG5znmi1Vo42mXqN8INjvatReI=; b=kagYT9usXUeWOqphlY9eygND0zVDXBZCBhOBoPJxNMlkf/zIq6VRFMC9VdYNiy/+KV B02ZrmXKruUWe75kmAofow4oZzAq/0+uV722GwDEYgK29d1aJmcYiPYyLK0Xj0pZlXjw ARYiGr5Ohw6GcQJCdeqjdo2lWWbTkF7DTyOmh3SCWV5bff4jqb0g7n1HB55IC43wOtyW QEv1AX1JVI4HxV6+YG4P7DYs/baX7hbpVfh/8E8gszAMmf2z3avSb6MikkzS3W/ueuLv xfGjFSZiqUaHbvPWRAK+FGEj7vkGGYu/kykaYkf90+aTMbBSw6vkl33udWFZjTw4hx/O OBUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2OwdBN+L5/lqkl/dGkG5znmi1Vo42mXqN8INjvatReI=; b=e3RrWtWMGxspmTAhDM7IexeuCYa3Xx7ATVzBFlQIlUYZBDf4s6G/5jAYaB1Wd/d/5M PhWRFgyzJSOw9PAcQMY1cDd9FwF5QjSJuIVaGC7CqcEHub/nsg238UOIgDGCk0Ui/rYH qX6IyC3XYynJs66ULxVR5RiPe+mmNgw8vEtkV2/R/viA58t7GZJp1FAG3qMGBegjjpHO DSdU4PMdj/9wW6jcicjbSE8T/IFEA/hOrhmANzAJzWPZmYn273/uEeSQlQvrfUcjgkuE rH6eZRuHhySmMb2zHNjA58glC1QX/Yu5xWai523xlTm6fdmh4Te9XER1viBsj1VOAnki eUtg== X-Gm-Message-State: AOAM5324uIrKkss4BWAD1ODY9Fq2c9oU1F8EZvFS2foijpOifs/3qt7e RZWX9z3FDrQK48DVl55TcHs+XGnHEcR2AA== X-Received: by 2002:aa7:d7c8:0:b0:3f9:3b65:f2b3 with SMTP id e8-20020aa7d7c8000000b003f93b65f2b3mr8055500eds.389.1645809980221; Fri, 25 Feb 2022 09:26:20 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q22-20020a170906771600b006cf8a37ebf5sm1224218ejm.103.2022.02.25.09.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:26:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8836B1FFC8; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 16/18] tests/tcg: completely disable threadcount for sh4 Date: Fri, 25 Feb 2022 17:20:19 +0000 Message-Id: <20220225172021.3493923-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The previous disabling of threadcount 3bdc19af00 ("tests/tcg/sh4: disable another unreliable test") just for plugins was being too conservative. It's all broken so skip it. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/sh4/Makefile.target | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 620ccc23c1..35ebe6b4e3 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -20,5 +20,7 @@ run-plugin-linux-test-with-%: $(call skip-test, $<, "BROKEN") # This test is currently unreliable: https://gitlab.com/qemu-project/qemu/-/issues/856 +run-threadcount: + $(call skip-test, $<, "BROKEN") run-plugin-threadcount-with-%: $(call skip-test, $<, "BROKEN") From patchwork Fri Feb 25 17:20:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545919 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp534925imf; Fri, 25 Feb 2022 10:18:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzo6X4zyjV1EIJlO55VgDbT6LboqFWQkkKQRZT9zsOsBS2JBiHBHzRgdrrSDWVvzLBB3P7I X-Received: by 2002:a05:620a:796:b0:60d:da81:6c3a with SMTP id 22-20020a05620a079600b0060dda816c3amr5654945qka.105.1645813087327; Fri, 25 Feb 2022 10:18:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645813087; cv=none; d=google.com; s=arc-20160816; b=QIcCjKshxAErYQ+kNICyUsnDnywkzYlMmpiMKWqzeCM/5kixncK2cbNM0n50WhOd8w P+dPYTz72Pw4PREZ2d2bqi69PtKEKYr+i6PUOAB7vXYyN3G/gKWS7Ib6i11jITLoF5gc KLnVpzWr+LY8SEcoTA12iyVD3dihmb+m+juqBD2LXARBw2VGV6Iq+rzO6MpmpRVTkKgl 0+fkuhvJcsDULFXYCUM2fOS4MTK5xzs592MltRklWH12izq9+4uW+KFvQ82IUi2fLVi6 iQcLAlisDBVnZt4ANIlQf/mH9kX8wblNzM4yaXsf2mhmEOb6t+wH4nNcGh29eJkqKwjJ n+IQ== 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=8bZPMvkbb7tGeLBxNDQtM1zt8Imgwt2NXrXBOA0R4KQ=; b=DeNts8MKQwh5/U3/8ZZqkWTUHZ+S0nDM8zu05oBU6fy9CpwFcW+C3+1+ITGq/VPpiA Y8XhEvZPaEgyGwuf+OkZMbc60RiNxaPC3mZMzhLZwdJqNuiHruGH0qjylQ84opjJq4i3 PvScU4HzSsWVJ3AEOxW2x/PNsmp5eWlpxVu5u6HP8FfPvLE9eTP+CaTMOZpXEMb409N0 DFH1aahPWDwo3x2DxYQLGMfUKHA45oYxomI0oNYzJeymxgTF5rD2XwyvdTL1JyzDrYYD 7Pc0iK317K92y1uYP0LP13NIpvQU2NSyxDPvTedzZ+DGuSUISlLtkTP9z6EJhjKxOtTN zEyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UETK0DGe; 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 c18-20020ac81112000000b002de93adff50si1427138qtj.768.2022.02.25.10.18.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 10:18:07 -0800 (PST) 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=UETK0DGe; 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]:39324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNfAM-0004SR-Qu for patch@linaro.org; Fri, 25 Feb 2022 13:18:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeMJ-0002mo-AM for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:26:23 -0500 Received: from [2a00:1450:4864:20::532] (port=34724 helo=mail-ed1-x532.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeMG-0004I3-Bq for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:26:22 -0500 Received: by mail-ed1-x532.google.com with SMTP id z22so8392129edd.1 for ; Fri, 25 Feb 2022 09:26:19 -0800 (PST) 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=8bZPMvkbb7tGeLBxNDQtM1zt8Imgwt2NXrXBOA0R4KQ=; b=UETK0DGe9nsT5LbuSfhe6hGklAll/6wKRnvAgXEdxDIOPI9YAksbV9yluXYgWq4B1J aIlvN4tTofECKiFJuSXe6Ave/91JvGI6P+sduL1RX1TWEjkDxLxmVWJ89ly1V2V70Apf 3hf9vhhdyoXxBnXvCz+bSp/4wCzJ6lfGqdnMQ69AhLgvgzYrdWVKKf3U7H1xqBnglOs3 FsfsIYAZ/f0xde6wJ/EFuQ1pah665Qb1KD8lZF46XCG5QudOtT71aeRcY7ZDxwjOpDcm A+VJV7IDWkbHVuyc+9VLnHJ52EmneEh+tUDYZZr7FAaUb6a9bwQiZtBKwlvK2Sapd1uM jDkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8bZPMvkbb7tGeLBxNDQtM1zt8Imgwt2NXrXBOA0R4KQ=; b=cHX+4anGS5A72dXzgLQwdAqL4dYn6fVZDs5xGO7MwDeczlspxk3qT+BVDi2fbfihNf mvwJj5nR+kMKjxh0CjpI4jtCRU9dD2dG2CG7/FfwbReBMTSG09exyrO/3OZ3IpVx19YL nJmoRhMuFMY6UwQYnzSn1iYAcVvPTbhZ2NMzMGG5Q8BrWgkpftChMTpNCYWynsvLmTQt Qm/HrVkd3vFJ2TEGUIjA79cst7VIL+p/y6noLHAoxFFBoaOWCpn8J2teULHgK5Rn+1JV lsxdK26s9BiXUXR1LbS5Uk7GvBxGP0vtxQZYJTFabN/n7EKdLE7JY5oso+XD8uEm5FDQ ZL8w== X-Gm-Message-State: AOAM531CPbysSAmTv5SZJJm+zAptTmPT6dqzgZ5dUzyOCNJUb2iJXGio zPALqjgkpkEZOtKayKG41fob9Q== X-Received: by 2002:a50:e0c7:0:b0:410:a63f:e1d with SMTP id j7-20020a50e0c7000000b00410a63f0e1dmr8028301edl.391.1645809978086; Fri, 25 Feb 2022 09:26:18 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w7-20020a056402268700b0040ed0e91a82sm1611919edd.102.2022.02.25.09.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:26:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 99A691FFC9; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 17/18] semihosting/arm-compat: replace heuristic for softmmu SYS_HEAPINFO Date: Fri, 25 Feb 2022 17:20:20 +0000 Message-Id: <20220225172021.3493923-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::532 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , Keith Packard , berrange@redhat.com, sw@weilnetz.de, Andrew Strauss , richard.henderson@linaro.org, f4bug@amsat.org, qemu-arm@nongnu.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" The previous numbers were a guess at best and rather arbitrary without taking into account anything that might be loaded. Instead of using guesses based on the state of registers implement a new function that: a) scans the MemoryRegions for the largest RAM block b) iterates through all "ROM" blobs looking for the biggest gap The "ROM" blobs include all code loaded via -kernel and the various -device loader techniques. Signed-off-by: Alex Bennée Cc: Andrew Strauss Cc: Keith Packard Message-Id: <20210601090715.22330-1-alex.bennee@linaro.org> Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220210113021.3799514-2-alex.bennee@linaro.org> --- v7 - remove stray comment --- include/hw/loader.h | 14 ++++ hw/core/loader.c | 86 +++++++++++++++++++++++ semihosting/arm-compat-semi.c | 124 +++++++++++++++++----------------- 3 files changed, 163 insertions(+), 61 deletions(-) diff --git a/include/hw/loader.h b/include/hw/loader.h index 4fa485bd61..5572108ba5 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -343,4 +343,18 @@ int rom_add_option(const char *file, int32_t bootindex); * overflow on real hardware too. */ #define UBOOT_MAX_GUNZIP_BYTES (64 << 20) +typedef struct RomGap { + hwaddr base; + size_t size; +} RomGap; + +/** + * rom_find_largest_gap_between: return largest gap between ROMs in given range + * + * Given a range of addresses, this function finds the largest + * contiguous subrange which has no ROMs loaded to it. That is, + * it finds the biggest gap which is free for use for other things. + */ +RomGap rom_find_largest_gap_between(hwaddr base, size_t size); + #endif diff --git a/hw/core/loader.c b/hw/core/loader.c index 19edb928e9..ca2f2431fb 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1333,6 +1333,92 @@ static Rom *find_rom(hwaddr addr, size_t size) return NULL; } +typedef struct RomSec { + hwaddr base; + int se; /* start/end flag */ +} RomSec; + + +/* + * Sort into address order. We break ties between rom-startpoints + * and rom-endpoints in favour of the startpoint, by sorting the 0->1 + * transition before the 1->0 transition. Either way round would + * work, but this way saves a little work later by avoiding + * dealing with "gaps" of 0 length. + */ +static gint sort_secs(gconstpointer a, gconstpointer b) +{ + RomSec *ra = (RomSec *) a; + RomSec *rb = (RomSec *) b; + + if (ra->base == rb->base) { + return ra->se - rb->se; + } + return ra->base > rb->base ? 1 : -1; +} + +static GList *add_romsec_to_list(GList *secs, hwaddr base, int se) +{ + RomSec *cand = g_new(RomSec, 1); + cand->base = base; + cand->se = se; + return g_list_prepend(secs, cand); +} + +RomGap rom_find_largest_gap_between(hwaddr base, size_t size) +{ + Rom *rom; + RomSec *cand; + RomGap res = {0, 0}; + hwaddr gapstart = base; + GList *it, *secs = NULL; + int count = 0; + + QTAILQ_FOREACH(rom, &roms, next) { + /* Ignore blobs being loaded to special places */ + if (rom->mr || rom->fw_file) { + continue; + } + /* ignore anything finishing bellow base */ + if (rom->addr + rom->romsize <= base) { + continue; + } + /* ignore anything starting above the region */ + if (rom->addr >= base + size) { + continue; + } + + /* Save the start and end of each relevant ROM */ + secs = add_romsec_to_list(secs, rom->addr, 1); + + if (rom->addr + rom->romsize < base + size) { + secs = add_romsec_to_list(secs, rom->addr + rom->romsize, -1); + } + } + + /* sentinel */ + secs = add_romsec_to_list(secs, base + size, 1); + + secs = g_list_sort(secs, sort_secs); + + for (it = g_list_first(secs); it; it = g_list_next(it)) { + cand = (RomSec *) it->data; + if (count == 0 && count + cand->se == 1) { + size_t gap = cand->base - gapstart; + if (gap > res.size) { + res.base = gapstart; + res.size = gap; + } + } else if (count == 1 && count + cand->se == 0) { + gapstart = cand->base; + } + count += cand->se; + } + + g_list_free_full(secs, g_free); + return res; +} + /* * Copies memory from registered ROMs to dest. Any memory that is contained in * a ROM between addr and addr + size is copied. Note that this can involve diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 37963becae..7a51fd0737 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -44,6 +44,7 @@ #define COMMON_SEMI_HEAP_SIZE (128 * 1024 * 1024) #else #include "qemu/cutils.h" +#include "hw/loader.h" #ifdef TARGET_ARM #include "hw/arm/boot.h" #endif @@ -144,33 +145,69 @@ typedef struct GuestFD { static GArray *guestfd_array; #ifndef CONFIG_USER_ONLY -#include "exec/address-spaces.h" -/* - * Find the base of a RAM region containing the specified address + +/** + * common_semi_find_bases: find information about ram and heap base + * + * This function attempts to provide meaningful numbers for RAM and + * HEAP base addresses. The rambase is simply the lowest addressable + * RAM position. For the heapbase we ask the loader to scan the + * address space and the largest available gap by querying the "ROM" + * regions. + * + * Returns: a structure with the numbers we need. */ -static inline hwaddr -common_semi_find_region_base(hwaddr addr) + +typedef struct LayoutInfo { + target_ulong rambase; + size_t ramsize; + hwaddr heapbase; + hwaddr heaplimit; +} LayoutInfo; + +static bool find_ram_cb(Int128 start, Int128 len, const MemoryRegion *mr, + hwaddr offset_in_region, void *opaque) { - MemoryRegion *subregion; + LayoutInfo *info = (LayoutInfo *) opaque; + uint64_t size = int128_get64(len); + + if (!mr->ram || mr->readonly) { + return false; + } + + if (size > info->ramsize) { + info->rambase = int128_get64(start); + info->ramsize = size; + } + + /* search exhaustively for largest RAM */ + return false; +} + +static LayoutInfo common_semi_find_bases(CPUState *cs) +{ + FlatView *fv; + LayoutInfo info = { 0, 0, 0, 0 }; + + RCU_READ_LOCK_GUARD(); + + fv = address_space_to_flatview(cs->as); + flatview_for_each_range(fv, find_ram_cb, &info); /* - * Find the chunk of R/W memory containing the address. This is - * used for the SYS_HEAPINFO semihosting call, which should - * probably be using information from the loaded application. + * If we have found the RAM lets iterate through the ROM blobs to + * work out the best place for the remainder of RAM and split it + * equally between stack and heap. */ - QTAILQ_FOREACH(subregion, &get_system_memory()->subregions, - subregions_link) { - if (subregion->ram && !subregion->readonly) { - Int128 top128 = int128_add(int128_make64(subregion->addr), - subregion->size); - Int128 addr128 = int128_make64(addr); - if (subregion->addr <= addr && int128_lt(addr128, top128)) { - return subregion->addr; - } - } + if (info.rambase || info.ramsize > 0) { + RomGap gap = rom_find_largest_gap_between(info.rambase, info.ramsize); + info.heapbase = gap.base; + info.heaplimit = gap.base + gap.size; } - return 0; + + return info; } + #endif #ifdef TARGET_ARM @@ -204,28 +241,6 @@ common_semi_sys_exit_extended(CPUState *cs, int nr) return (nr == TARGET_SYS_EXIT_EXTENDED || is_a64(cs->env_ptr)); } -#ifndef CONFIG_USER_ONLY -#include "hw/arm/boot.h" -static inline target_ulong -common_semi_rambase(CPUState *cs) -{ - CPUArchState *env = cs->env_ptr; - const struct arm_boot_info *info = env->boot_info; - target_ulong sp; - - if (info) { - return info->loader_start; - } - - if (is_a64(env)) { - sp = env->xregs[31]; - } else { - sp = env->regs[13]; - } - return common_semi_find_region_base(sp); -} -#endif - #endif /* TARGET_ARM */ #ifdef TARGET_RISCV @@ -251,17 +266,6 @@ common_semi_sys_exit_extended(CPUState *cs, int nr) return (nr == TARGET_SYS_EXIT_EXTENDED || sizeof(target_ulong) == 8); } -#ifndef CONFIG_USER_ONLY - -static inline target_ulong -common_semi_rambase(CPUState *cs) -{ - RISCVCPU *cpu = RISCV_CPU(cs); - CPURISCVState *env = &cpu->env; - return common_semi_find_region_base(env->gpr[xSP]); -} -#endif - #endif /* @@ -1165,12 +1169,12 @@ target_ulong do_common_semihosting(CPUState *cs) case TARGET_SYS_HEAPINFO: { target_ulong retvals[4]; - target_ulong limit; int i; #ifdef CONFIG_USER_ONLY TaskState *ts = cs->opaque; + target_ulong limit; #else - target_ulong rambase = common_semi_rambase(cs); + LayoutInfo info = common_semi_find_bases(cs); #endif GET_ARG(0); @@ -1201,12 +1205,10 @@ target_ulong do_common_semihosting(CPUState *cs) retvals[2] = ts->stack_base; retvals[3] = 0; /* Stack limit. */ #else - limit = current_machine->ram_size; - /* TODO: Make this use the limit of the loaded application. */ - retvals[0] = rambase + limit / 2; - retvals[1] = rambase + limit; - retvals[2] = rambase + limit; /* Stack base */ - retvals[3] = rambase; /* Stack limit. */ + retvals[0] = info.heapbase; /* Heap Base */ + retvals[1] = info.heaplimit; /* Heap Limit */ + retvals[2] = info.heaplimit; /* Stack base */ + retvals[3] = info.heapbase; /* Stack limit. */ #endif for (i = 0; i < ARRAY_SIZE(retvals); i++) { From patchwork Fri Feb 25 17:20:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 545913 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp518159imf; Fri, 25 Feb 2022 09:59:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrJUG+Ubji1PtkkhWcaqgbCYzNEbX6L0AiiQNONW6IqRdW4TRybxMSqa2R8kMXCh93vinu X-Received: by 2002:a0c:ffb4:0:b0:432:5198:f398 with SMTP id d20-20020a0cffb4000000b004325198f398mr6813806qvv.12.1645811980613; Fri, 25 Feb 2022 09:59:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645811980; cv=none; d=google.com; s=arc-20160816; b=BYL+WVKkV2R1/w6oD3qD1hHIwTmGf/pzWQ5b44rWvGFIqYPyHEXOxGiSFA67RWqjyM Wg5/Z4iqX2QSswaJbzA8v2D67DjoTSObfm7NCHmhnLCHPdxtkufcZ6j9eH0eAI+Ujfts 4U9Kg0I2qyNGPMgz3L+A6KrD3qJ1zFRNDKcPbrX39XD/mteb7GZR8ohQuxnpptzogPll EPI+Aduhk0as54qQa6pcd2FFlx4HqGPj1ZCNFsqYhAx2SE/3DrCmy7A8FH+jR/5DhbgP wWQVlNPMyIR1Rs7x8TGo/LMB7NXqk/BQ310DU340W7PZv58wHB48/8xjkIx9KbanYDKR cFdA== 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=JR//9KiItwNd050+o2fTFYSPa/InsS8zg93yxzEMbvU=; b=sp13TzcYQzOAccUpOWA2bsM/3/Cl8gm5af7+XBmESbvrYddWODFtyGMiea0tcWdhM+ omjERa5G5o98PzmqqH8/mx373sDN2IrFW1Ewps1q6hfM5PCnUinM9xNNq4T8JVbwnDH+ An/gRwTOXpPvfpPeGSU0QBpB8ZNhClKFkYOudf3EBgVeATMql6fxGiVk1IAvBFMjPt+f I4S7frGiNNGn0EWFTAyFUJFUxrGRrc0zUHhwL4eGwgYPPigPbYGVGtU2+w+fnPXNd4HE jf5H7g8toha0bI7ZvIyA64o6O72QAaPBxdqNHG1OgqEqMy6m3A4S3TiXn6sFl1Z74hAs vz0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MIR9fjQG; 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 m9-20020a05620a214900b006626a423fdbsi989631qkm.393.2022.02.25.09.59.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Feb 2022 09:59:40 -0800 (PST) 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=MIR9fjQG; 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]:56136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNesW-0002Id-4m for patch@linaro.org; Fri, 25 Feb 2022 12:59:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNeH7-0004ML-BO for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:21:01 -0500 Received: from [2a00:1450:4864:20::635] (port=33665 helo=mail-ej1-x635.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNeGz-0002Ph-68 for qemu-devel@nongnu.org; Fri, 25 Feb 2022 12:21:01 -0500 Received: by mail-ej1-x635.google.com with SMTP id vz16so12272807ejb.0 for ; Fri, 25 Feb 2022 09:20:44 -0800 (PST) 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=JR//9KiItwNd050+o2fTFYSPa/InsS8zg93yxzEMbvU=; b=MIR9fjQGObmfYVyPs8RiTn1Gyn9PhdLYqKP9mjQ0tWCU60JtVv/OPe9COr5aNqlT8n N2b3AsAmKY4Pb1qXDiahycL+UB25K4w2C018tf+BSaPvBaOLL8bg9s4TYolwBrgjVEYE SaqC8UyUW2blolstwkuHd8n6FRa6jzAlUa20jnTQtSAYsCiotc2UX9gaJTvOn9O6aJoa hJoQCgqlBD5gnr+RT7Mr97hoqOMBbkYEFSGR8tHD5IuA1i5F4BrHV45L/4Yu1PQE/MtI Gx+tzyKAKIzyC7lCW+8/dc0lVNaEFjUvONo0BO5K+KYAaIE8m++u5kUKXExkOKCfWFRt wXvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JR//9KiItwNd050+o2fTFYSPa/InsS8zg93yxzEMbvU=; b=J+snzyW8OUJYSIelNPdxH9EyiN1FqSnzaC6dNfaTpRdcnMB2C9QQLe/AJMzmnqVpok zmrnWk8ijSpZz706hqIalVA7DQJ2Wze7h5hjcyr0kN6xqrJkJQYYqoFRvA/VzZtY3wo1 mAdkebLwAeR0YzFB+sFd66YpWNsvQBwjDX64oPZXUpqpxAO1VyW8m4brdolGTXH6OY9H PnF9nxBUfDcuTDvXuzu/X5o0tdQ2XJFZik8o/fK7FZZHEBAzvfwncsuPsdWuJtyEXxnM sa79Kir+LmSynWYWszO79KUMF9SQBQ2fzPWlKd2Bt1bu8ix6qTsbH+w6gKaoU8u0ZSkA 6t1Q== X-Gm-Message-State: AOAM532iCop/bd2Bdz4j/I8NoZ7L/kbTvJwuBQDXBaKKTiRnFR6TVw1s uTgDPUBfUb8rUYkTLNeXRsuYzg== X-Received: by 2002:a17:906:3803:b0:6cf:56b9:60a9 with SMTP id v3-20020a170906380300b006cf56b960a9mr6613981ejc.716.1645809643944; Fri, 25 Feb 2022 09:20:43 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r3-20020aa7cb83000000b0040decce18bdsm1571180edt.99.2022.02.25.09.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:20:39 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D2AA61FFCA; Fri, 25 Feb 2022 17:20:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 18/18] tests/tcg: port SYS_HEAPINFO to a system test Date: Fri, 25 Feb 2022 17:20:21 +0000 Message-Id: <20220225172021.3493923-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225172021.3493923-1-alex.bennee@linaro.org> References: <20220225172021.3493923-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::635 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , berrange@redhat.com, sw@weilnetz.de, richard.henderson@linaro.org, f4bug@amsat.org, qemu-arm@nongnu.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 allows us to check our new SYS_HEAPINFO implementation generates sane values. Signed-off-by: Alex Bennée Reviewed-by: Peter Maydell Message-Id: <20220210113021.3799514-3-alex.bennee@linaro.org> --- tests/tcg/aarch64/system/semiheap.c | 93 +++++++++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 94 insertions(+) create mode 100644 tests/tcg/aarch64/system/semiheap.c diff --git a/tests/tcg/aarch64/system/semiheap.c b/tests/tcg/aarch64/system/semiheap.c new file mode 100644 index 0000000000..4ed258476d --- /dev/null +++ b/tests/tcg/aarch64/system/semiheap.c @@ -0,0 +1,93 @@ +/* + * Semihosting System HEAPINFO Test + * + * Copyright (c) 2021 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include + +#define SYS_HEAPINFO 0x16 + +uintptr_t __semi_call(uintptr_t type, uintptr_t arg0) +{ + register uintptr_t t asm("x0") = type; + register uintptr_t a0 asm("x1") = arg0; + asm("hlt 0xf000" + : "=r" (t) + : "r" (t), "r" (a0) + : "memory" ); + + return t; +} + +int main(int argc, char *argv[argc]) +{ + struct { + void *heap_base; + void *heap_limit; + void *stack_base; + void *stack_limit; + } info = { }; + void *ptr_to_info = (void *) &info; + uint32_t *ptr_to_heap; + int i; + + ml_printf("Semihosting Heap Info Test\n"); + + __semi_call(SYS_HEAPINFO, (uintptr_t) &ptr_to_info); + + if (info.heap_base == NULL || info.heap_limit == NULL) { + ml_printf("null heap: %p -> %p\n", info.heap_base, info.heap_limit); + return -1; + } + + /* Error if heap base is above limit */ + if ((uintptr_t) info.heap_base >= (uintptr_t) info.heap_limit) { + ml_printf("heap base %p >= heap_limit %p\n", + info.heap_base, info.heap_limit); + return -2; + } + + if (info.stack_base == NULL) { + ml_printf("null stack: %p -> %p\n", info.stack_base, info.stack_limit); + return -3; + } + + /* + * boot.S put our stack somewhere inside the data segment of the + * ELF file, and we know that SYS_HEAPINFO won't pick a range + * that overlaps with part of a loaded ELF file. So the info + * struct (on the stack) should not be inside the reported heap. + */ + if (ptr_to_info > info.heap_base && ptr_to_info < info.heap_limit) { + ml_printf("info appears to be inside the heap: %p in %p:%p\n", + ptr_to_info, info.heap_base, info.heap_limit); + return -4; + } + + ml_printf("heap: %p -> %p\n", info.heap_base, info.heap_limit); + ml_printf("stack: %p <- %p\n", info.stack_limit, info.stack_base); + + /* finally can we read/write the heap */ + ptr_to_heap = (uint32_t *) info.heap_base; + for (i = 0; i < 512; i++) { + *ptr_to_heap++ = i; + } + ptr_to_heap = (uint32_t *) info.heap_base; + for (i = 0; i < 512; i++) { + uint32_t tmp = *ptr_to_heap; + if (tmp != i) { + ml_printf("unexpected value in heap: %d @ %p", tmp, ptr_to_heap); + return -5; + } + ptr_to_heap++; + } + ml_printf("r/w to heap upto %p\n", ptr_to_heap); + + ml_printf("Passed HeapInfo checks\n"); + return 0; +} diff --git a/MAINTAINERS b/MAINTAINERS index fa8adc2618..68adaac373 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3549,6 +3549,7 @@ S: Maintained F: semihosting/ F: include/semihosting/ F: tests/tcg/multiarch/arm-compat-semi/ +F: tests/tcg/aarch64/system/semiheap.c Multi-process QEMU M: Elena Ufimtseva