From patchwork Wed Feb 15 19:25:28 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: 653745 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp524967wrr; Wed, 15 Feb 2023 11:27:41 -0800 (PST) X-Google-Smtp-Source: AK7set88pfOf+I/2nklzwQsMIqCNIFs2Js0Uvv/JUZhRubLsfOabzawi/C2ER4yAJQUp3iz1lUUn X-Received: by 2002:a05:622a:1483:b0:3ba:2722:e8d7 with SMTP id t3-20020a05622a148300b003ba2722e8d7mr5474337qtx.7.1676489261593; Wed, 15 Feb 2023 11:27:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676489261; cv=none; d=google.com; s=arc-20160816; b=zBHSeJFYr8gghvEaVTVbRvE1hlSV2miHYF/u5dxMwlGjJ6zM/pHOgajWtbekkJNxxI z5VmaIMaZlZPZ8lFoYv5WsTnH6ogvCfSlEQB02pf/4pxfUD8UoE6UBSmG14/r3nXiV7d bOjRrcczNu9prpVOnROBin6ivaqjE5xNhZeLTOASFXOXn5fbHoBs8+MrA+/gSDbyD7tB RigM3t1L2ShVC7ihJCW9Mo1yVFtqBjGsyeRHcMJKX230T87Bqi5JolEqCBx41HvHKTgP s1mPJzrE7e/t55JSx8phoLgVdCoHR2hi5spWevjty8hkUap3KMR1E4AAp/Y1K3TV5vJN Yv+A== 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=i1ygqzeQVGCuPcwoBCSUGziqmUHDcFPufoB7wqrTRgA=; b=mw0qWhPP4nPpf1fz6sZwUXXA+g+lvIUn1u4fLYRZhu9LShttleckkjqTzskHaF1Z/U kjU1Z5LVgmTGzU9WyapF3lESmj7Zs3e07bQQO6vja8bQZRQsMQNptJW/+TcSBwPqm9Ky zpgivUco3xUFrfPOHSsIaa+JEWO0bOidj5Jn5++tiCHKy1vvypwCfxVl7BMojBuC8EBj 8EuQCJvYkAI+3OrXhGVLrO2BWRsqg+5R4wWeNEQ8y4v8CtyHP7F9RYclefE8qV6ZR9MH mcL1C1cTd5i5WwQEdFhv5kgLk5oSuNXFqiuJqR/ArUcNc2vFE2t6sUWYp/10hvXiU0p1 i+8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="I/oM8+D+"; 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 bq38-20020a05620a46a600b007293ca24c3csi15502384qkb.24.2023.02.15.11.27.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Feb 2023 11:27:41 -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="I/oM8+D+"; 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 1pSNPY-0006nF-Ki; Wed, 15 Feb 2023 14:25:49 -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 1pSNPS-0006kq-BS for qemu-devel@nongnu.org; Wed, 15 Feb 2023 14:25:42 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSNPP-0001i4-1U for qemu-devel@nongnu.org; Wed, 15 Feb 2023 14:25:42 -0500 Received: by mail-wm1-x334.google.com with SMTP id f18-20020a7bcd12000000b003e206711347so1392992wmj.0 for ; Wed, 15 Feb 2023 11:25:37 -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=i1ygqzeQVGCuPcwoBCSUGziqmUHDcFPufoB7wqrTRgA=; b=I/oM8+D+GrSfvNQPpiDGm0TisB+8JUD53RZfysZAY5P0rvpowslOp97hpLY+VjgSPk TV6hnUmP3zlITqsNAEsFGsoJMVGq/L68aB++vHlQcGnIJlqGZK+UKXlWjfqrfFXpuc3g TDWmzl0uvGn0oRq2ryiVeD2YdWdMti2zlhuZ5Uq00L2GlYKQHbyC6F6G1eicq9W0mmHP 9Gj7qE7/G+OSMk+rXtiLCzhuCH2JqTzo5lBMaUWNWukWSDQ46PJbF9XEnmDCa5wJ+Snc ZqE8F6DQlCeYd8eC8DVJR5wdXCEtzv0s24bZxfRrYCxT4F8HiVBwuqWBrg97BIpE4M2T GdLg== 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=i1ygqzeQVGCuPcwoBCSUGziqmUHDcFPufoB7wqrTRgA=; b=w0lW9iHedbGdZ8fStVy5FqCg7Vc5QwvLMMJT2iJyyZvY26EdQ7mSZpqPAD12QxP8ig vfF+HO5OrsaoXph5VugVKRNLhqrAhCep+SK8RF3jFcms3ibowemPHHW5Y44cC05eb5Xc tXhGo1gB0lEOEi7rbxWf8gZISR3kbj7Wb1SfVJ4BcKASF2jO7EPVajUjWl9aQEPl/86D yR6ZGwzMrXzcCF/vKyGVBEcngDiy9bg31uwLaPK7xLFPeyD1Go8fZ1YfwRp2pmFmcTd6 UN6j1GmJGM15lQcGBtlVPfnOVWgjIxKyKDQ1Ib6TvMo0v91mAXwknT8INpRO6oGo3fhg CsaA== X-Gm-Message-State: AO0yUKVHT9tFUiWOmIcJKkfYouktxf9GflMBcWN4YCSsCld7F/BQYHkM avUONUkuUtZpzpXbp6Svnw5P6NPDxrvlcMo2 X-Received: by 2002:a05:600c:5386:b0:3df:9858:c039 with SMTP id hg6-20020a05600c538600b003df9858c039mr4233323wmb.14.1676489136046; Wed, 15 Feb 2023 11:25:36 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i19-20020a05600c355300b003e200d3b2d1sm3079714wmq.38.2023.02.15.11.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 11:25:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B97AA1FFC0; Wed, 15 Feb 2023 19:25:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Michael Roth , Alexander Bulekov , Qiuhao Li , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , qemu-arm@nongnu.org, John Snow , Pavel Dovgalyuk , Darren Kenny , =?utf-8?q?Alex_Benn=C3=A9e?= , Stefan Hajnoczi , Bandan Das , Cleber Rosa , Peter Maydell , Bastian Koppelmann , Yonggang Luo , Li-Wen Hsu , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Beraldo Leal , Ed Maste , Wainer dos Santos Moschetta Subject: [PATCH 10/12] tests/docker: Use binaries for debian-tricore-cross Date: Wed, 15 Feb 2023 19:25:28 +0000 Message-Id: <20230215192530.299263-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230215192530.299263-1-alex.bennee@linaro.org> References: <20230215192530.299263-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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 Reviewed-by: Philippe Mathieu-Daudé --- 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 $@ $<