From patchwork Tue Feb 28 19:06:40 2023 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: 657482 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097559wrb; Tue, 28 Feb 2023 11:09:51 -0800 (PST) X-Google-Smtp-Source: AK7set8asNd7vu3VQkz4C7HCZSPojTmAJNkA7YggGZMFXHQ1SjtM4m/qCMeF2fFzddVxX/2/p4T0 X-Received: by 2002:a05:6214:2461:b0:56e:b59d:2ee7 with SMTP id im1-20020a056214246100b0056eb59d2ee7mr8188419qvb.47.1677611391185; Tue, 28 Feb 2023 11:09:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611391; cv=none; d=google.com; s=arc-20160816; b=bEeBTTzl6upmAPb51s4rkWv1Udop/vnCqEIZKFFPBfm9Z1nXqfwqfFv+XIc2dSvuZH wUgk3P2ipAf796iTQgA4IoHa+sx8ItgixGx64V0S5tCShudCM2DARB2+d5YxWSNKTcwG tuGPqIEssG+Lx93aTF66g8H1jDRa3lZWU7Vr9ivvIW+MkmSh1mbSRkXb4K2JECwUzqZD 4JRjGHnhzl/LfLLYJCxiH7N2YmJQaSfaZfkuEAXPDuhQYH6/cgCL2VME8jJuPke9cNot 7VIv8kB+19PEPo8u7QhEmyYWiq6nnP6Bf2u0pogqtqd2iBR1/9MgxAUL6+c82ATutd11 ChxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bqKQZTDvOZ1wpytMTM7QInXR36A1/tJ8b2AKON/coNY=; b=Cn5Lmr1L0n5oDaWzjD4eJtgyZso15ZKftnz34aRb+Te5YClMAlj5sKiR7AKpheEsUl 98I64cyxlZtO16XgZlN37Io0HutiGTdFmEbpXCb1M7j6MAG4YeQg9XNCZvV8+Qq5x2G8 peE7Uhre46MRnDV2KelG7XzpZzQgnldiUFl1SH29h17XxmN6YcaoW1UrRVwNWjsMrTAn gmrLihIceB1oLNmcHtgjZJGPm14A7VKlRfbCoBqWxTad3q8w5TAYQ+bsNc6V/IMJz3LM 7hoNHRdtSZ0YmVy4XAZoFphYdNWhMHH53dKdjQ/K6M2Fhayd/qaDbvXmBWQAA2Olm7Eh oSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FryCXJ+g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g3-20020a05620a40c300b0071fc1fee8aesi10568613qko.446.2023.02.28.11.09.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:51 -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=pass header.i=@linaro.org header.s=google header.b=FryCXJ+g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KH-0002b4-6H; Tue, 28 Feb 2023 14:07:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002JU-Ir for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JV-0002qB-Cb for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:11 -0500 Received: by mail-wr1-x42b.google.com with SMTP id r18so10893500wrx.1 for ; Tue, 28 Feb 2023 11:07:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bqKQZTDvOZ1wpytMTM7QInXR36A1/tJ8b2AKON/coNY=; b=FryCXJ+g78WhQfGimALybwu64Dke8UWXuGPUyiAl6rnIduENmk4uQOcR5/Tq04hwfg rvw0dHHoskE3bHmbllyDV1f9Kfk5zVHbSB6DdGO2goC1RB4wqX3NVc7XyiwWoKcd2JAd kXwZfF6HQN9N44KdFvjYSw8LkO/FXdMtGR65Qk3s/65t+9Jb4cQs2lpdNID59D0sNeVR Php84ip1sY9toIqekvJYFMJJcScg3T0xJNsEyoqappnPUIXn1ek+/0Vp/7y7P466bgQW QgNadbi7+18A7PXnbrGZKN0R3Inm6DicUY2WI9nUOOrJ7+SHYADOTMuzT29S/kV28fA8 s9uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bqKQZTDvOZ1wpytMTM7QInXR36A1/tJ8b2AKON/coNY=; b=vvbvCqKYRUtQ5q3kzEJFf6wcY/zH3cW7S9gDfoeS49rMvlz2I6Va00UAtJt8F2q1Tw 36V3VJ72Kj8Oi9YwboX8WOFj98WCnXU1nJfBoNunEsrqa2yP2W5o0TYwWApbJArfIUU2 afHxxeLozYrlKMEm3l/BTZjbshtsdRHTOCe2KHY1TygdTjIHNEUSs0ha57S+kZ5eF7jh Gc/XUEypHeUv50DRqNvYzJuKhCJ1rDfH+dLq7SJNizqLZjaxW0cZ7X9HLo5eQjrDpUsN hCtVceiCaHu0dGQY8v5B33qpUQnEl8yq6rK0CsNnTjh/7ASwnayBlPvcbT2KQU+W9zwA sH2Q== X-Gm-Message-State: AO0yUKWqCQ0BLiF7bDhMtxrsem67zYEYX/Al88cuieE2UklsSW/YP7K2 3kTudJ8wY2ubOJZz4uVYcreuxA== X-Received: by 2002:a5d:5e8c:0:b0:2c3:d707:7339 with SMTP id ck12-20020a5d5e8c000000b002c3d7077339mr10670367wrb.6.1677611219745; Tue, 28 Feb 2023 11:06:59 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a14-20020a5d4d4e000000b002c57475c375sm10580099wru.110.2023.02.28.11.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 979B31FFC1; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 11/24] tests/docker: Use binaries for debian-tricore-cross Date: Tue, 28 Feb 2023 19:06:40 +0000 Message-Id: <20230228190653.1602033-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bastian Koppelmann since binutils is pretty old, it fails our CI repeatedly during the compilation of tricore-binutils. We created a precompiled version using the debian docker image and download it instead of building it ourself. We also updated the package to include a newer version of binutils, gcc, and newlib. The default TriCore ISA version used by tricore-as changed from the old version, so we have to specify it now. If we don't 'test_fadd' fails with 'unknown opcode'. The new assembler also picks a new encoding in ld.h which fails the 'test_ld_h' test. We fix that by using the newest TriCore CPU for QEMU. The old assembler accepted an extra ')' in 'test_imask'. The new one does not, so lets remove it. Signed-off-by: Bastian Koppelmann Message-Id: <20230209145812.46730-1-kbastian@mail.uni-paderborn.de> Signed-off-by: Alex Bennée Message-Id: <20230221094558.2864616-13-alex.bennee@linaro.org> --- tests/tcg/tricore/macros.h | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 10 +++------- tests/tcg/tricore/Makefile.softmmu-target | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index ec4f5bff52..3df2e0de82 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -174,7 +174,7 @@ test_ ## num: \ TEST_CASE_E(num, res_lo, res_hi, \ LI(DREG_RS1, rs1); \ rstv; \ - insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2); \ + insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2; \ ) diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 5ae58efa09..82e4576485 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -20,6 +20,7 @@ RUN apt update && \ bzip2 \ ca-certificates \ ccache \ + curl \ flex \ g++ \ gcc \ @@ -34,13 +35,8 @@ RUN apt update && \ python3-setuptools \ python3-wheel -RUN git clone --single-branch \ - https://github.com/bkoppelmann/tricore-binutils.git \ - /usr/src/binutils && \ - cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \ - make && make install && \ - rm -rf /usr/src/binutils +RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \ + | tar -xzC /usr/local/ # This image can only build a very minimal QEMU as well as the tests ENV DEF_TARGET_LIST tricore-softmmu diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index d2446af8b4..b3cd56fffc 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -1,7 +1,7 @@ TESTS_PATH = $(SRC_PATH)/tests/tcg/tricore -LDFLAGS = -T$(TESTS_PATH)/link.ld -ASFLAGS = +LDFLAGS = -T$(TESTS_PATH)/link.ld --mcpu=tc162 +ASFLAGS = -mtc162 TESTS += test_abs.tst TESTS += test_bmerge.tst @@ -19,7 +19,7 @@ TESTS += test_madd.tst TESTS += test_msub.tst TESTS += test_muls.tst -QEMU_OPTS += -M tricore_testboard -nographic -kernel +QEMU_OPTS += -M tricore_testboard -cpu tc27x -nographic -kernel %.pS: $(TESTS_PATH)/%.S $(HOST_CC) -E -o $@ $<