From patchwork Mon Apr 17 18:20:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 84390 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2318712vqo; Mon, 17 Apr 2023 11:22:24 -0700 (PDT) X-Google-Smtp-Source: AKy350YJY57GhmpFHMoAyoHRLU/ylJc41Rq961YacWO99E2TpMY29eJIULQ+Z2fX5rI5Y15VwVWr X-Received: by 2002:a17:906:e118:b0:94a:6c0a:63e7 with SMTP id gj24-20020a170906e11800b0094a6c0a63e7mr6975148ejb.54.1681755744443; Mon, 17 Apr 2023 11:22:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681755744; cv=none; d=google.com; s=arc-20160816; b=HknPAoyaYGAX4Vz4Nuu8KNCIaUbJanfPTxY4g8ZV3k49OphWm2QqymItNCZjcOtJrT JuYqo1RSHPPtCbo+95reh7q/L81+5UwiLHr1FEYWcBWd8n9kpRTGPmGWMg5ZHWDRC9sg OTKkE+/9eh5+g83T2Hp/kBkLVMOg+91y0Jk3LbJG/44E1s1p9U/co1kVxurYAxSBVu1E tKRRFTlrhdBMDwcY2znnUEi9d98cqWmVsKm5c7eEuJ5/I3n4g1afAiDHT3PLdBi64je2 +Eu1TdMatmEslQ2D8QA8YxYEc0vhqSpGWICLjVC3433/jgFjmaHsvK4bXfwCCOTh8wx3 bOaA== 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:to:from:cc :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:dkim-signature:dmarc-filter:delivered-to; bh=03x6JZnjPYy1dc4t8astsj8H9klrS/s86ZQ+mytF5RY=; b=i7Wsupc5sXB4Bp/uoV5XUJE8JjnjDvGVB4dS6zhb3im0V2WNAGksKxbK+AZttEDcc4 TmVy0bedw0y8gb46ySV1F1i9WIY2DHR9MYSF8CM01Yn/EHdp0M/2Qji6u2/c8zWsz1Zu 7Yx9Fh6YI/cC7zOx69Mz2/Pmyw47t8TqMEmweIxhAfaxFANams4fg8r7TDDxVe2lyUx1 VHCT6TM2ZcVwVlYv0w9Mamyet4Zv2VZnk0ye2wnIE8K1ndhhMBS6W7r9y2FKcDTOk/rc x13oO2P6RfAW2DEibzUfm3cj1l0fji/KEiw01DfOLRr9RbXsTatEIF5XjhaFMhdlfV6/ iJHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Pp6NK9jy; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id fg9-20020a1709069c4900b0094f7daa895esi1679273ejc.589.2023.04.17.11.22.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 11:22:24 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Pp6NK9jy; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DCAF3852769 for ; Mon, 17 Apr 2023 18:21:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id A3F303858C2D for ; Mon, 17 Apr 2023 18:21:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A3F303858C2D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pj1-x102e.google.com with SMTP id w11so27134860pjh.5 for ; Mon, 17 Apr 2023 11:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681755664; x=1684347664; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=03x6JZnjPYy1dc4t8astsj8H9klrS/s86ZQ+mytF5RY=; b=Pp6NK9jy/ienAUKB6k8u8msYmMdU3rPsuMCXxOVXYLN9TPAdTQy0uC42DHFSQCFeht TkIcqcCu7yNldFnalAIsyBjg3g0ZH4bKBbg6e7PtuzgZKofALVmYSvPbFjV8P8/tQVDk lMf/t3RdYZ3XynQJEpkmTjP4EpL/96FqTjpGbaCf5YR1JU7lwoMtsftxhQRPemo3HdSm Ho/wWzqJV9p8ZxTwJlALsOUm694QJJS/7+1H4O6OFIJQ15WnNb0wgG4fPJbJrYKeZIvh sKGC9kTtHCyB2rYjlDDTVncmS5b7u7mxduW5ZbbQP1WrGjfL8j5IdbXYPNX3nhQQ2fJ6 1/Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681755664; x=1684347664; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=03x6JZnjPYy1dc4t8astsj8H9klrS/s86ZQ+mytF5RY=; b=UFcnOJfDE9TN68kv9iuflNIPZb3Zb10BYhUZsjWb4YnFjwI1dPLr2goREE+pxPk7OF Ibi9x/RoHG14CF2qQs1LsTZVZEcZchlAxKTOBZOyAef4nrA/Yil+bWxQC18e8L0crkvF EoAqzVhoywKVvFXj+RuL/nlyfwoGQMgjaB1EYfCLnNo5dbMAqkOqLA/OhARLNUvICbn/ wbAmMob3EI6858qXg1D1eWN0q6z5psw7NBr3nhzgKsMIKUhQE/h9lYfIKV4b+SqxRvpv ZKBIpys8U6BCnLq/25K/6wHjao1UGQ2eGUeSnl8w8dRFv4pOjxGPQyrVh+sNq2BywXCx pqnA== X-Gm-Message-State: AAQBX9eot+cbPgmRq9Z2BUWc9tbOIb0lsYn49j6lrSLdJsCcgOAFiT5N s67JwZC8TtW3r5+c5U6/T9Q803ZE88RK9sVzqjw= X-Received: by 2002:a17:902:e54a:b0:1a2:3b6:8319 with SMTP id n10-20020a170902e54a00b001a203b68319mr16496704plf.54.1681755664372; Mon, 17 Apr 2023 11:21:04 -0700 (PDT) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id q3-20020a170902788300b001a67a37beeesm841137pll.139.2023.04.17.11.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 11:21:04 -0700 (PDT) Subject: [PATCH 13-backport 1/3] RISC-V: Clean up the pr106602.c testcase Date: Mon, 17 Apr 2023 11:20:42 -0700 Message-Id: <20230417182044.22425-2-palmer@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417182044.22425-1-palmer@rivosinc.com> References: <20230417182044.22425-1-palmer@rivosinc.com> MIME-Version: 1.0 Cc: Palmer Dabbelt From: Palmer Dabbelt To: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763448711525256764?= X-GMAIL-MSGID: =?utf-8?q?1763448711525256764?= The test case that was added is rv64i-specific, as there's better ways to generate this code on rv32i (where the long/int cast is a NOP) and on rv64i_zba (where we have word shifts). This renames the original test case and adds two more for those targets. gcc/testsuite/ChangeLog: PR target/106602 * gcc.target/riscv/pr106602.c: Moved to... * gcc.target/riscv/pr106602-rv64i.c: ...here. * gcc.target/riscv/pr106602-rv32i.c: New test. * gcc.target/riscv/pr106602-rv64i_zba.c: New test. (cherry picked from commit 8c010f6fe5ebe80d2e054b31e04ae0e9f12ae368) --- gcc/testsuite/gcc.target/riscv/pr106602-rv32i.c | 14 ++++++++++++++ .../riscv/{pr106602.c => pr106602-rv64i.c} | 2 +- .../gcc.target/riscv/pr106602-rv64i_zba.c | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/riscv/pr106602-rv32i.c rename gcc/testsuite/gcc.target/riscv/{pr106602.c => pr106602-rv64i.c} (88%) create mode 100644 gcc/testsuite/gcc.target/riscv/pr106602-rv64i_zba.c diff --git a/gcc/testsuite/gcc.target/riscv/pr106602-rv32i.c b/gcc/testsuite/gcc.target/riscv/pr106602-rv32i.c new file mode 100644 index 00000000000..05b54db7486 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/pr106602-rv32i.c @@ -0,0 +1,14 @@ +/* { dg-do compile { target { riscv64*-*-* } } } */ +/* { dg-options "-O2 -march=rv32i -mabi=ilp32" } */ + +unsigned long +foo2 (unsigned long a) +{ + return (unsigned long)(unsigned int) a << 6; +} + +/* { dg-final { scan-assembler-times "slli\t" 1 } } */ +/* { dg-final { scan-assembler-not "srli\t" } } */ +/* { dg-final { scan-assembler-not "\tli\t" } } */ +/* { dg-final { scan-assembler-not "addi\t" } } */ +/* { dg-final { scan-assembler-not "and\t" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/pr106602.c b/gcc/testsuite/gcc.target/riscv/pr106602-rv64i.c similarity index 88% rename from gcc/testsuite/gcc.target/riscv/pr106602.c rename to gcc/testsuite/gcc.target/riscv/pr106602-rv64i.c index 825b1a143b5..ef0719f4a9a 100644 --- a/gcc/testsuite/gcc.target/riscv/pr106602.c +++ b/gcc/testsuite/gcc.target/riscv/pr106602-rv64i.c @@ -1,5 +1,5 @@ /* { dg-do compile { target { riscv64*-*-* } } } */ -/* { dg-options "-O2" } */ +/* { dg-options "-O2 -march=rv64i -mabi=lp64" } */ unsigned long foo2 (unsigned long a) diff --git a/gcc/testsuite/gcc.target/riscv/pr106602-rv64i_zba.c b/gcc/testsuite/gcc.target/riscv/pr106602-rv64i_zba.c new file mode 100644 index 00000000000..23b9f1e60f6 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/pr106602-rv64i_zba.c @@ -0,0 +1,15 @@ +/* { dg-do compile { target { riscv64*-*-* } } } */ +/* { dg-options "-O2 -march=rv64i_zba -mabi=lp64" } */ + +unsigned long +foo2 (unsigned long a) +{ + return (unsigned long)(unsigned int) a << 6; +} + +/* { dg-final { scan-assembler-times "slli.uw\t" 1 } } */ +/* { dg-final { scan-assembler-not "slli\t" } } */ +/* { dg-final { scan-assembler-not "srli\t" } } */ +/* { dg-final { scan-assembler-not "\tli\t" } } */ +/* { dg-final { scan-assembler-not "addi\t" } } */ +/* { dg-final { scan-assembler-not "and\t" } } */ From patchwork Mon Apr 17 18:20:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 84391 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2318766vqo; Mon, 17 Apr 2023 11:22:31 -0700 (PDT) X-Google-Smtp-Source: AKy350YNZ6IC2V/srAezBx1wKzHQHn4JIWDQZ37UsbAOC8IIIyIpsiMjaFy4lRwduomFvqz2xc/D X-Received: by 2002:a17:906:4d8f:b0:931:ad32:79ed with SMTP id s15-20020a1709064d8f00b00931ad3279edmr8262761eju.12.1681755751048; Mon, 17 Apr 2023 11:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681755751; cv=none; d=google.com; s=arc-20160816; b=YYXFe6+CzVMqwwp6NTuOjICd6ulbnTmR48ZvoR3NJVUVgbsdjnpTZ5Zare30et4Svj HcB9sSUz5xq5XOhYyzDPC3ojsDxvhZyrsYl/9UHyWuEM7CjZHspLxbvOEHpNqMGkLQQi z8zMHIrFt/F2eZrdRXfY7MhLtbUf8mlkpnOnn6AVEAMaReqq0z9He1o89t1DjRC/VN1p XOrZLQwoQ4G94WFPYoceVCWFlj78EWU8rK7FdZpfq15XG4OxPoCZYn+gHStehA/4vUUr SVm3cYSqgiV1Min4zed1RhPZh15Uf5tu52lGADyseoldwyxJTSv3gknffA6EHhUgw4DQ 1SkA== 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:to:from:cc :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:dkim-signature:dmarc-filter:delivered-to; bh=wUW9zK4FOlxK0s0LGmbIQFPkFLhucMvmh4ZmwrE7fkw=; b=MG3J28vsiGkQ0PUfPmdfSfCOSKnm5Z5LfWpNcnhU8YosT8RXBxTH+vMETsKJGoSE+b Fo44XpcXvPqSG1qcE1BXHdC7GpnBMRm1HtdR+KUTLp17PRJOorbR55Z4ylJdhp03pbW2 JjRR/OieVc8SprOZNtPy6XlvE3PX7fLn+x9gyoNf9SNj6lrJvk+w4YMxvZ2Vawl2eZ3i GFU0a0EcINrNzgGUE7OOfJ5aw81Hi7hA/i2Lu6Js6uiD3PWZTeKKhRZEizMtCaEudLkK URcnCk/FS3M9TguPlSiLzRVSMCOrLm+/fRgout2y1JiJLHOr+DTbhRR9aF9uGmExY72P NUgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=xfO9VbP6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id l21-20020a170907915500b0094f10dbffb4si5290149ejs.551.2023.04.17.11.22.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 11:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=xfO9VbP6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 06F7F3851C28 for ; Mon, 17 Apr 2023 18:21:37 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by sourceware.org (Postfix) with ESMTPS id 7D9663858C39 for ; Mon, 17 Apr 2023 18:21:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D9663858C39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pj1-x1034.google.com with SMTP id hg12so12125411pjb.2 for ; Mon, 17 Apr 2023 11:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681755665; x=1684347665; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=wUW9zK4FOlxK0s0LGmbIQFPkFLhucMvmh4ZmwrE7fkw=; b=xfO9VbP6isHkvyQlkLH6hb7zXOmRsJJal0gdj+qddoTmzCZQWRbDqYR6R5q0xovxq/ 4pwdaMEh829IA36TFx9keFQLC6rHkm4H4gYxGAE78iigqTyNvS7kwtzrjuSXTqjhrun0 QXWgI+f72S0Wi2+pl2kAMwlC6Qtxdzjx2/6LoSTG1OkZ5tRzFviggK603D848DKTPRin KBdB1etUxcOBhHsNXPHcbME3IIxTGlNnCG7LVEZY5eW5D1B/94ioNrDqppuKO6vTamym sNyusoubTtN1P7jXQVy3LQ3et1FdloANVNNYfNOhj/Ncgg6Qf/GRuJz+GqrAbNHNI3iY bTWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681755665; x=1684347665; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wUW9zK4FOlxK0s0LGmbIQFPkFLhucMvmh4ZmwrE7fkw=; b=eWz3JZCm7me2ZU7Eu0U7KF3la6SWWGKtNVz5Hr0GLdEKiUVIFAbt9YwL3GCJvUP0Hp CkEDJvL/fTRK+YhH2J04HMKrwHhcIkyHXqLyWAztTduS7FL6IaVUZL6MzhgWrtyGVq6e ymsKUjVs36x9ZLlxewbDFYjehNraxq10tvMn7Og0A/iaN8kvArXbC27brDjwVIO9oj4D TQNoR4davDURUAAMTyynAtjNgC6lfzq0fD9oBR2GHJBx+lW7HjTm+/1zNKboK/3CsdxJ 2nGyhIYu/YWA0PMpniPfUT0XIuNspbJCjJiTwJM9omNmeGgN7H7JvYaeZwP9JYve8qR8 TqMg== X-Gm-Message-State: AAQBX9dNE3mRcaZ91/Rv9Xt3fVZrS+0F+FwrAMG2rbhtvCbakqFRf/zb 82T38J3f/tiCnJ4Lh/hHbepYcPDIdppFz7T3f40= X-Received: by 2002:a17:902:db06:b0:1a1:f0cb:1055 with SMTP id m6-20020a170902db0600b001a1f0cb1055mr16348622plx.28.1681755665542; Mon, 17 Apr 2023 11:21:05 -0700 (PDT) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id p3-20020a1709026b8300b001a688de1f0esm7780197plk.234.2023.04.17.11.21.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 11:21:05 -0700 (PDT) Subject: [PATCH 13-backport 2/3] RISC-V: Set the ABI for the RVV tests Date: Mon, 17 Apr 2023 11:20:43 -0700 Message-Id: <20230417182044.22425-3-palmer@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417182044.22425-1-palmer@rivosinc.com> References: <20230417182044.22425-1-palmer@rivosinc.com> MIME-Version: 1.0 Cc: Palmer Dabbelt From: Palmer Dabbelt To: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763448718318178239?= X-GMAIL-MSGID: =?utf-8?q?1763448718318178239?= The RVV test harness currently sets the ISA according to the target tuple, but doesn't also set the ABI. This just sets the ABI to match the ISA, though we should really also be respecting the user's specific ISA to test. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/rvv.exp (gcc_mabi): New variable. (cherry picked from commit e6b050da8a4513ab37fd3699c7a963421fbe4d81) --- gcc/testsuite/gcc.target/riscv/rvv/rvv.exp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp b/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp index 7a9a2b6ac48..4b5509db385 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp +++ b/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp @@ -31,15 +31,17 @@ if ![info exists DEFAULT_CFLAGS] then { } 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 "$DEFAULT_CFLAGS -march=$gcc_march -O3" +set CFLAGS "$DEFAULT_CFLAGS -march=$gcc_march -mabi=$gcc_mabi -O3" dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/base/*.\[cS\]]] \ "" $CFLAGS gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/vsetvl/*.\[cS\]]] \ From patchwork Mon Apr 17 18:20:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 84392 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2319175vqo; Mon, 17 Apr 2023 11:23:24 -0700 (PDT) X-Google-Smtp-Source: AKy350YGqvFUDG6ytgmBUje9IgT6GdNvU1ezJ0GGvt35VYPhi6ewOh/jr9Ge7i6ZcmM1q2Pif02Y X-Received: by 2002:aa7:dd59:0:b0:4fa:8aa4:8d8b with SMTP id o25-20020aa7dd59000000b004fa8aa48d8bmr12689126edw.7.1681755804061; Mon, 17 Apr 2023 11:23:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681755804; cv=none; d=google.com; s=arc-20160816; b=DUwIGBkHfF59ZSwRe29/zPKlpRMARpNG9cazDDQTr3NtWVWejKHs64fspPHuTZkjQH qZMO5A/CyjxpezcwoIFa5oU58wn+UrTGbnTGnqxMbSMuRohcXdCHUNW91OXdZB5Tu7wy oOq7BgqvD41FazxWof50enjXP2FlCHFt1icirtRrxBjx9trh1fWnYsIBE6YPp66RtGWE yyTUVpUkWBfmNjliLcJF2Ere3V1YN2Vpmc+GH6pRUP8wsgjMPLx4PgO5MW/nxAjoFWFd dX40xbKGfiRtqzKi70KUmHF0CAF4K1k0wtntU+gHoYGERduT9AnhKni7DFTnJnqCXruL WDpw== 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:to:from:cc :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:dkim-signature:dmarc-filter:delivered-to; bh=q+VSXYdnTlcl29UsFWrJ/q0qnlmop/jczVJdPphHE60=; b=PyiXZ6b5JfQbWUKwyW7nQHjXN6i0NPMkBGak88NSUmMlfvhBLQ6cnxH11vfNKHzHzo 77isfBlwzgDoAY+JfZGR1P5oNV2uXibgxCPrvGQMoFAEG+0HhOmTFaUwfc+w+ESk83eL Moq1TE+qxXUUzsyMwRgobp7YrlEZyIEaWKWbchEXRmhfhpJeOERUPBC4hiVvaH5e0A/t RlGZlcxMJpFwCR6kurrCPxlliPAvnYAa88a3+6COdP2ZQ1JbTqg6HU8BO2DVFRFKZKW0 mhM4IPVxvqUol63up4gUI4e1Y2mDLCNdKfgdw5ceufkVNN2egpAhw/sz4CHpR0Gd1qB/ JWdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=XpdHLpwb; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id vz12-20020a17090704cc00b0094f2e8d96a5si4094707ejb.985.2023.04.17.11.23.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 11:23:24 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=XpdHLpwb; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D16F93853819 for ; Mon, 17 Apr 2023 18:22:04 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id 1DE893858C3A for ; Mon, 17 Apr 2023 18:21:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1DE893858C3A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pj1-x102a.google.com with SMTP id fw22-20020a17090b129600b00247255b2f40so13259352pjb.1 for ; Mon, 17 Apr 2023 11:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681755666; x=1684347666; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=q+VSXYdnTlcl29UsFWrJ/q0qnlmop/jczVJdPphHE60=; b=XpdHLpwbuFQOMTJh/PZ+JZEho1RUdWoKlGjCwHk7OAmyPVSb9noFd1L+WmEQ/d7iwI fGtiLmS57MsGuSlLc5H4dvvZQYDmrGrVAye67wDBp36OCJDOj3a7qxSjxcqDgNXmKUGO uYs2JdOPjICbWqWTmBms4YkxXPhejEHH+pg7+lXsm1vraH2QI9Q7mZ8iZE7hiHyOQq7N N2my0kbr7wWfpXkLDsrIvuEBRHQDg1kYEYGHq5tdpeayg0AERQAtwG9qeRX3ymhMRXlm 6vP2AyyB4BSlHyuXl597TVmfj0aj7ehvviqkK/M8lAnWWAf7vkbI2cDlqQNs/OaWb/CS gQ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681755666; x=1684347666; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q+VSXYdnTlcl29UsFWrJ/q0qnlmop/jczVJdPphHE60=; b=JoXD0juxa91hdFkndOmVSYU8n/1DQV34MpgpJsnDbivVRgI7rPE+rhBNGfS3DyoDaQ FtbTy+Tgk3hJa0joQnKpP0Vgey0uUqPpjiYhQBanUBj/e5s1/ldqRmALo5uU4tyVI1cD grsUD1fa6O+Yo3gDTwkdDXkV3HIo0wNn7wAgkAPZ/FvLH5uZX8UJGpKNrCnPYLuuNj6y Jktqh9yzRMFX6Lmq+/5/L793JMZBwwqC8mF1UP93TYlb82Hz9zx8X/ImopmGTo4OAlFU MJb6vuo+aXKSxHHNZ49RGgffjYOZk8dVPjQtFoZy/52gwCEC9rGZk/v4A/1cNWTKu98+ pKGw== X-Gm-Message-State: AAQBX9dqWbe+CyJXsJUjMZa2cxwhdSUYLdVSlC4fIIE5AFxI1XgTZm2l 9a22rp0tcMpBtejhaAGoL283j2YDEWHyJ9K3NiU= X-Received: by 2002:a17:902:ea08:b0:1a6:f755:a4a0 with SMTP id s8-20020a170902ea0800b001a6f755a4a0mr1205832plg.58.1681755666692; Mon, 17 Apr 2023 11:21:06 -0700 (PDT) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id x3-20020a1709027c0300b0019e88453492sm8004837pll.4.2023.04.17.11.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 11:21:06 -0700 (PDT) Subject: [PATCH 13-backport 3/3] RISC-V: Force ilp32d for the T-Head FMV test Date: Mon, 17 Apr 2023 11:20:44 -0700 Message-Id: <20230417182044.22425-4-palmer@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417182044.22425-1-palmer@rivosinc.com> References: <20230417182044.22425-1-palmer@rivosinc.com> MIME-Version: 1.0 Cc: Palmer Dabbelt From: Palmer Dabbelt To: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763448773697495731?= X-GMAIL-MSGID: =?utf-8?q?1763448773697495731?= These functions are NOPs on the soft-float ABIs. Since we're already forcing the ISA, let's just force the ABI too. gcc/testsuite/ChangeLog: * gcc.target/riscv/xtheadfmv-fmv.c: Force the ilp32d ABI. (cherry picked from commit c16848ed8f30be952ac0167fd464ae794fa5ac67) --- gcc/testsuite/gcc.target/riscv/xtheadfmv-fmv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmv-fmv.c b/gcc/testsuite/gcc.target/riscv/xtheadfmv-fmv.c index 10d035e9e1d..1036044291e 100644 --- a/gcc/testsuite/gcc.target/riscv/xtheadfmv-fmv.c +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmv-fmv.c @@ -1,5 +1,5 @@ /* { dg-do compile { target { rv32 } } } */ -/* { dg-options "-march=rv32gc_xtheadfmv" } */ +/* { dg-options "-march=rv32gc_xtheadfmv -mabi=ilp32d" } */ /* { dg-skip-if "" { *-*-* } { "-O0" } } */ double