From patchwork Thu Oct 26 00:13:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick O'Neill X-Patchwork-Id: 1855432 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=o8tz14MU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SG5r30Tn1z202k for ; Thu, 26 Oct 2023 11:13:53 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2FB533856954 for ; Thu, 26 Oct 2023 00:13:51 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by sourceware.org (Postfix) with ESMTPS id 3CEDB3858C31 for ; Thu, 26 Oct 2023 00:13:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3CEDB3858C31 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3CEDB3858C31 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::836 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698279219; cv=none; b=fxCk6kqHxocsmiFu1vq7J2sfyHMhSIJ503c4+dPDzvJH1VelYDT01jUxZSSoKAurTrl3xN5tRmpKdXeE/3+Mci5e4KiIMplWcBG/xMCIh9lbBfV+38Fr41kehiY0Dkeyi4Nal006iUy4y/HfJU80E1Osm8Aqz5+IVH2sS8xgSm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698279219; c=relaxed/simple; bh=AC9RIDaGsT6z+s3ckZzhQmt4apzi2Z7Oubh89IDZUmw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Zs4gim0kCNxvw9KHyn7PYB6zqH9wexRMgVSpLaRrkDdqQeahysAvph33C7r9o2/0HAg327bcs8/Djl8NsQvdZ3Wy3xXQJkBnw6jUT2jzP7+SX0Vk0uKxUOPM/gWyaYNWAm1XJTEYJrTjUGjkbahtrHt9F0xFPUkCF4++q/m2UH4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-41cd6e1d4fbso2516741cf.1 for ; Wed, 25 Oct 2023 17:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698279217; x=1698884017; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qOLXcaurxsRFnJ36zIyO1HwjWnZFpnsAjgw5dIcqEY4=; b=o8tz14MUKWBzHVP0aIfL13LNS8VlFFzaVLKsTWU+uAWFI4nf209kACGPd/67ioalQz 2ECrToddiIu/XL+ISvZdL1Q16HjZ7B8/Z1beMH/SNaVkV8DFb5F3oAOZOnbUBlqqJzyA PlTkIEzoMqLaz6/Q6syF2cblzRAWWkLhhKYuZEO56SK4YJKXpL9OfnHvBEui4byc87+8 w7LMUTc4e/aVGwpt0r7rwRg3U7Z2ZKmYwflbUh+tACivgh6rzAqIXRZ64LMExyjMgVLP xqgc2uSQR7v3XpAcIKoRU8yA5VO3grHysBxZR1iPTVMbKNHmZn82QZpolSt0mIt0XBDg mObQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698279217; x=1698884017; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qOLXcaurxsRFnJ36zIyO1HwjWnZFpnsAjgw5dIcqEY4=; b=OkAPYtlfqyWvS61KobrAch7Do8jVRYh+bvwy6bZc1FulF7BdCiFpai/EKs95pl88A4 YfkMZUHOaMBYPXGzaWY6Ov0BASZ6nd4a5LRxM42+NJPHUZ4BQs0D/M4J8yw91A4LiSeA 7dvBrDHp7Rn7XJUhBu+8lKT/mrw8ZAkh+BcMwtNOPZbdgkBiN15+Tw48ymcNRSng66Vw 99QLkqEFnG0i5ooI5poh0UDPvuJMlDoNDkjihMro0o5+j/kP5hBfX9uttaiET6tm1Pwm iCvScLrQsZhGNYOK1zS1fFNJ5mzF3Xk+e8TG91nxJkFZZtyjqvOWrlv/DShxSn6QazOC +xFw== X-Gm-Message-State: AOJu0YzAvDfFoh5FN7zpr6GmCcpq/+ezT/3gV2k1XcvTplHidhyaZZyJ cIHZznYvaTqOTu8iIfa04/LdsQw4w8zIReEzRsM= X-Google-Smtp-Source: AGHT+IEWQ9F5/2gpNofqtzLL7XfJnQxFHp0GDPUS/VhFCvkdPXjz0HUm3POczZGy7JevW1vKo0Sn1Q== X-Received: by 2002:a05:622a:589:b0:41c:be07:c6c7 with SMTP id c9-20020a05622a058900b0041cbe07c6c7mr16254130qtb.24.1698279217229; Wed, 25 Oct 2023 17:13:37 -0700 (PDT) Received: from patrick-ThinkPad-X1-Carbon-Gen-8.hq.rivosinc.com ([208.116.208.98]) by smtp.gmail.com with ESMTPSA id d23-20020ac85357000000b0041812703b7esm4607093qto.52.2023.10.25.17.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 17:13:36 -0700 (PDT) From: Patrick O'Neill To: gcc-patches@gcc.gnu.org Cc: Patrick O'Neill Subject: [PATCH] RISC-V: Pass abi to g++ rvv testsuite Date: Wed, 25 Oct 2023 17:13:10 -0700 Message-Id: <20231026001310.1261462-1-patrick@rivosinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org On rv32gcv testcases like g++.target/riscv/rvv/base/bug-22.C fail with: FAIL: g++.target/riscv/rvv/base/bug-22.C (test for excess errors) Excess errors: cc1plus: error: ABI requires '-march=rv32' This patch adds the -mabi argument to g++ rvv tests. gcc/testsuite/ChangeLog: * g++.target/riscv/rvv/rvv.exp: Add -mabi argument to CFLAGS. Signed-off-by: Patrick O'Neill --- Resolved failures: FAIL: g++.target/riscv/rvv/base/bug-18.C (test for excess errors) FAIL: g++.target/riscv/rvv/base/bug-19.C (test for excess errors) FAIL: g++.target/riscv/rvv/base/bug-20.C (test for excess errors) FAIL: g++.target/riscv/rvv/base/bug-21.C (test for excess errors) FAIL: g++.target/riscv/rvv/base/bug-22.C (test for excess errors) --- gcc/testsuite/g++.target/riscv/rvv/rvv.exp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/g++.target/riscv/rvv/rvv.exp b/gcc/testsuite/g++.target/riscv/rvv/rvv.exp index c30d6e93144..5b01e4e05d2 100644 --- a/gcc/testsuite/g++.target/riscv/rvv/rvv.exp +++ b/gcc/testsuite/g++.target/riscv/rvv/rvv.exp @@ -28,15 +28,17 @@ if ![istarget riscv*-*-*] then { load_lib g++-dg.exp set gcc_march "rv64gcv_zfh" +set gcc_mabi "lp64d" if [istarget riscv32-*-*] then { set gcc_march "rv32gcv_zfh" + set gcc_mabi "ilp32d" } # Initialize `dg'. dg-init # Main loop. -set CFLAGS "-march=$gcc_march -O3" +set CFLAGS "-march=$gcc_march -mabi=$gcc_mabi -O3" dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/base/*.C]] \ "" $CFLAGS