From patchwork Wed Mar 1 15:15:51 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: 657808 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544015wrb; Wed, 1 Mar 2023 07:17:44 -0800 (PST) X-Google-Smtp-Source: AK7set/JJgaDR5G8EFXGkUKWv//EjLY0PnWKySKTJsEBmCLsKGETIOHIZ1lb70KQvVf/D2YDBUvo X-Received: by 2002:a05:622a:115:b0:3bf:a08d:b265 with SMTP id u21-20020a05622a011500b003bfa08db265mr30740177qtw.24.1677683864773; Wed, 01 Mar 2023 07:17:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683864; cv=none; d=google.com; s=arc-20160816; b=iK5gvWUox5QD9xsLTn32m0JsigMb9BkSyQsUo3x+WCL2DE/k2ZjWoUb6q6sG0EONdS aua/UfCW9LANniAy1bahQDuC6DVpWQNrDLt2YT2tT8AJGqeTpFkRRXUfVF/szSVBcg7k OETmr1NT/i0XThSOIGixVjac0WzB+kIsTi5ac2OX9txujeS1DArvzPLycvojaEO3eS5J hAuI/M6vwHO4TXMbcOOvOI+ori4C3ABZe02wipi/loMvI2blpmPghRDO7duLEEzIoHNj +ZtPDvUJb5slhgC4RNA7IsjB6rUuQDk74oN/TGISZft7HyBrSn0+ZlS/nKAmYP+zrGYn xKPQ== 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=M4X95ZwnspHpgdYhEfY3qoUK+TpfRMK73yKGv3Ei+gY=; b=Z00eTZDmu5NvHVfU/3DjfDojj7FFjBPIy3LQiyVwxFouXmdzFgEOI0ghd+1B4Rhm5W N8vXWXmmPkddJkoEh94pXdKOlTot+69t+nt6Zbep1LPT629V40jBUdWC1hM6ZJDeZQ/x Q8tXSo9qnVfhAL/ObPSFkVz7XGrKiQK89Yw8dRwRDNI7EeL1Pk1CaBdzHVEKm8eJKXUH hMmXHmC5TJRpkfJrQ9i085g7uh9BZJMLq/fKAi/YZbGkmssO5f3qlOJcOff71AjMTnwB zVPU6CMxnUIcfz0tVrjAdKDR0nYEq15Bz5OXAE6l3h3XYvveJ8GhcO86+lg+NiH8UGwu 7FsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vRHUmOpz; 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 y14-20020a05622a004e00b003bccff19a53si11941513qtw.686.2023.03.01.07.17.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:44 -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=vRHUmOpz; 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 1pXOCG-0000BB-It; Wed, 01 Mar 2023 10:16:48 -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 1pXOBj-00089J-3M for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBe-0007c3-ID for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: by mail-wm1-x32a.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so8058764wmi.3 for ; Wed, 01 Mar 2023 07:16:10 -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=M4X95ZwnspHpgdYhEfY3qoUK+TpfRMK73yKGv3Ei+gY=; b=vRHUmOpzVa6B682CWBPLJpV7XtE3kEaL7/ONWf1b0FWNxpVVPKvp9k2nCmvlSdbOcU gXJIdp5UFEv1XqOJKy5u22s6luXxOZ79ZPjaOiRdf6psFt9ZeAA5uQ9ZsEYNwKS3mNjI pgL/KwwbqGKdwWHVYGbbu0j2OD6ils4MvhCRX6kPadgC+9sqBOPlvf4FhtDS9e0ilNhO Nc8JqWrsJTjC9j6Wa1Q3kJW0qJ5RB+a2qLkGE+rlq94okvymyDMWljZ2M6E8IAOZmJOr 7AX+oNgQz1uX0xZJ49I/lfEgDVjU2puhayyD5NTk55KIz9ZrFbS+Qe357S+kmzEmNz8S z4jQ== 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=M4X95ZwnspHpgdYhEfY3qoUK+TpfRMK73yKGv3Ei+gY=; b=G+NYPv+ruYnk0EldXn010YoqM3su+3UQzOkDhODnTfncwFUM+ZV7YUm81TQWS047NA Diz+SZCQnOsvWMBnetaNC3yAL7A5YtAIuv2/XmrPWgyTxPPgjdgn/1Ude9P0bzjUHmOu MrIYlVXa5vD2z0bF7stNM4gFktck/6FUrUcHeRfO2neLV6WpxceTF1VVRNLLsvRrr3lg SOvW566woPW65dPVMZ0i4QeEcFVaDdZ5DrSUYzG2BCpBchDPnG1+zLBfc3SXoQkMyFbI iWKnlT7pK9+El17YbkhGfmZsHLyla4lvgTPAoyxnHB2JGQd8obEGVnutQ5J8Njuu0MU2 TK4Q== X-Gm-Message-State: AO0yUKVmzKIOdwZJ3XmYkvSBg4g09UsAYCLB0gA/4MzMFMW2gSm1tWeq JwJ7K2+VPiIEzL3wFafGcX2LIg== X-Received: by 2002:a05:600c:3b87:b0:3eb:2f06:c989 with SMTP id n7-20020a05600c3b8700b003eb2f06c989mr5493746wms.22.1677683769111; Wed, 01 Mar 2023 07:16:09 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c470700b003eb3933ef10sm14679016wmo.46.2023.03.01.07.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:09 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DDE9D1FFC1; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Bastian Koppelmann , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 11/24] tests/docker: Use binaries for debian-tricore-cross Date: Wed, 1 Mar 2023 15:15:51 +0000 Message-Id: <20230301151604.1948813-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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: <20230228190653.1602033-12-alex.bennee@linaro.org> 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 $@ $<