From patchwork Tue Apr 15 04:24:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 110449 X-Patchwork-Delegate: jlaw@ventanamicro.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A9C5C385842D for ; Tue, 15 Apr 2025 04:25:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A9C5C385842D Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=c6dm0yKU X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by sourceware.org (Postfix) with ESMTPS id 3AB16385841C for ; Tue, 15 Apr 2025 04:24:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3AB16385841C Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3AB16385841C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::102b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744691078; cv=none; b=kKadAboIQ8OkShwdDZzKw93MKhBKcKZX5JJISsP2p39KQfrxW8/m1cc/GScy7LNLA87TkCgr1zUX+GgLSv6bMGcBl9KT9tYnDttSTD9UY2m6Nl9gru7K5slNn4KbymyO/GHOxhOd86XhUblldmMlFhAJcZ30cgtSlEDZBAjvfFI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744691078; c=relaxed/simple; bh=No54QWc93sW98NYTk6mbcRp2eWS+7YEXYH6NgBzQnRE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=kdbuChH+LJBGscJM0SjzOJ481DEATfB8LJMiNnbHKJfkT7u/7xfV+ghsHS/rafMl6i/UGe3nuJJP9Lv2U+hZCIkmQP+7hsbG51emefhj70IliX9H8cVt+jqyIgy3fKX5KwA5RF/tE/8R/kgRSAAkAjmNRaltvntJrUKCOh3Zv3U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3AB16385841C Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-301a4d5156aso5364188a91.1 for ; Mon, 14 Apr 2025 21:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1744691077; x=1745295877; darn=gcc.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vnB0WOo2h12dsiEmpaSueHknrFjE60bv7KStzjuquyc=; b=c6dm0yKUHZoiLJ+9B48l8w1AMJIi9dnKAsJBEtuNsrXt3Jlr2L434cWhKGvfTc3iXv UQHoEgxLlhknk8Yg+IHJnAWonmzmhKd9mO0lpb6Tbz2WW9+GANRsoaYml9Sn8Y0KL9G6 Wm6wFebaEg4QJx3A2SrVvHfGypo9fxEYwFc2gfjA29H4I7yiHp8T1Y6HsTdxIixLQdKU /ieFqblvS+DNRhdTrzPNcjMISLfbgLNtWInhr07bn+/u0vSt7KzvBrZ+SqvsbD9U+t49 ZHIclJiBhUzxaRyCXL5IyDrfErvPu2RapWdzR7FEjCWaWaaYfTRraj4LvF9pbNeolOrJ lcAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744691077; x=1745295877; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vnB0WOo2h12dsiEmpaSueHknrFjE60bv7KStzjuquyc=; b=FrX7uqK5A9ELaFcWu+aGOjvdxM251iUWYCRyBQjwiYWsNNmNz/xoncI0Mf7u07gfgx 5ZGFE1hSHSekQf5nq3YY/+gNkHp51oSh4plYUQXQddpGbQ+WGS7zPBFrt6NjUB/QPfU1 bBpTH1e2etp2Rr/MYVEZzPcniB+IwpeBWEwUzgNvczu+UtCkN1RHfXbWJcdtYnsXocYj ZZ+OfmFt4DtdNpTfaFQmIanWO2zg6MODZRr/zbUZZ18x9oaM0TQCFsBvy2klVuKCvRGP VzZLz9OGKhywNh2LUefNYyvO8HYKVpXm9WNf/Z9so83mSYWG66Ftig1P/zuMnRo3486I ZR/Q== X-Gm-Message-State: AOJu0Yyz6znv38dmEfY8yODtWg8uF3Iavdn8do3xRK1HDa3xjhBH2V+c CzCVJOVDPJkbODxgQgM9fblkwOUoZsA/iW+bNoCRIH84mFHCmlP7PZj6JhnMYg== X-Gm-Gg: ASbGnctnYlYTCSkagrv1PgUiiF92fa2sYs/dHIpGmwHP3rHPUgGBcnBREPuLJdU1J3J 8MvQpfrxARlYZmnbM6YPBbLg+rSOchgCEToKvCn4fP2EMHUXdayzr5OyhJmpQREp0Lq1AiHwvP6 hyfuMmmNkkxW69fJku5yDfwbe2Nud8uUcW/wDIThwgkE04gKr1dIJH/crT30sdkeZ/Hk5SfRyFN XmNceud8LxDyi0v8zRQTmPcq3MKXJqqqPN5KdPsAUBl7y+ka0vcK0PmhYN+zQkd5i9q8y9RPhHq xLe83biZLbioG6vbdPd5g0S5ddgMtwHJfpCwbuk6zQHoSk8= X-Google-Smtp-Source: AGHT+IH02dARWjcpGYmN0sKFuLpJUkRqNDikUmoFF1JgeaV+OsB0bVRVUTOqC8EOv6iLnqoERxCnFw== X-Received: by 2002:a17:90b:5845:b0:2ff:6f8a:3a13 with SMTP id 98e67ed59e1d1-30823671275mr19405692a91.25.1744691077039; Mon, 14 Apr 2025 21:24:37 -0700 (PDT) Received: from free.home ([2804:7f1:218b:766e:4592:91f4:fc8d:2e3c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-306df06a1a3sm11961253a91.9.2025.04.14.21.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 21:24:36 -0700 (PDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 53F4ONMJ2129982 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Apr 2025 01:24:24 -0300 From: Alexandre Oliva To: Jeff Law Cc: gcc-patches@gcc.gnu.org, Kito Cheng , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Robin Dapp , Juzhe Zhong Subject: RISC-V: revert pr114194 tests on gcc-14 [PR118601] Organization: Free thinker, does not speak for AdaCore References: <221bc9fc-29a9-42f9-b728-9d60c8ea5452@gmail.com> Date: Tue, 15 Apr 2025 01:24:23 -0300 In-Reply-To: (Jeff Law's message of "Mon, 14 Apr 2025 17:17:07 -0600") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, WEIRD_QUOTING 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~patchwork=sourceware.org@gcc.gnu.org And here's another that came up more recently: The gcc-14 backport that split the pr114194 testcase for rv32 and rv64 would only generate the expected rv32 sequence if commit 6b315907c0353f71169a7555e653d29a981fef67 had also been backported, but it wasn't. Without it, we get the same code as before on both rv32 and rv64, so revert to the original test. Also tested on riscv64-elf and riscv32-elf on x86_64-linux-gnu. Ok for gcc-14? for gcc/testsuite/ChangeLog PR target/118601 * gcc.target/riscv/rvv/xtheadvector/pr114194.c: Restore. * gcc.target/riscv/rvv/xtheadvector/pr114194-rv64.c: Remove. * gcc.target/riscv/rvv/xtheadvector/pr114194-rv32.c: Likewise. --- .../riscv/rvv/xtheadvector/pr114194-rv32.c | 51 ------------------ .../riscv/rvv/xtheadvector/pr114194-rv64.c | 55 -------------------- .../gcc.target/riscv/rvv/xtheadvector/pr114194.c | 56 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 106 deletions(-) delete mode 100644 gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv32.c delete mode 100644 gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv64.c create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c diff --git a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv32.c b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv32.c deleted file mode 100644 index 0bee5ec33de83..0000000000000 --- a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv32.c +++ /dev/null @@ -1,51 +0,0 @@ -/* { dg-do compile { target rv32 } } */ -/* { dg-options "-march=rv32gc_xtheadvector -O2" } */ -/* { dg-final { check-function-bodies "**" "" } } */ - -/* -** foo0_1: -** sb\tzero,0\([a-x0-9]+\) -** ret -*/ -void foo0_1 (void *p) -{ - __builtin_memset (p, 0, 1); -} - -/* -** foo0_7: -** li\t[a-x0-9]+,7 -** th.vsetvli\tzero,[a-x0-9]+,e8,m1 -** th\.vmv\.v\.i\tv[0-9],0 -** th\.vse\.v\tv[0-9]+,0\([a-x0-9]+\) -** ret -*/ -void foo0_7 (void *p) -{ - __builtin_memset (p, 0, 7); -} - -/* -** foo1_1: -** li\t[a-x0-9]+,1 -** sb\t[a-x0-9]+,0\([a-x0-9]+\) -** ret -*/ -void foo1_1 (void *p) -{ - __builtin_memset (p, 1, 1); -} - -/* -** foo1_5: -** li\t[a-x0-9]+,5 -** th.vsetvli\tzero,[a-x0-9]+,e8,m1 -** th\.vmv\.v\.i\tv[0-9],1 -** th\.vse\.v\tv[0-9]+,0\([a-x0-9]+\) -** ret -*/ - -void foo1_5 (void *p) -{ - __builtin_memset (p, 1, 5); -} diff --git a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv64.c b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv64.c deleted file mode 100644 index 84333c1cf5a7c..0000000000000 --- a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194-rv64.c +++ /dev/null @@ -1,55 +0,0 @@ -/* { dg-do compile { target rv64 } } */ -/* { dg-options "-march=rv64gc_xtheadvector -O2" } */ -/* { dg-final { check-function-bodies "**" "" } } */ - -/* -** foo0_1: -** sb\tzero,0\([a-x0-9]+\) -** ret -*/ -void foo0_1 (void *p) -{ - __builtin_memset (p, 0, 1); -} - -/* -** foo0_7: -** sb\tzero,0\([a-x0-9]+\) -** sb\tzero,1\([a-x0-9]+\) -** sb\tzero,2\([a-x0-9]+\) -** sb\tzero,3\([a-x0-9]+\) -** sb\tzero,4\([a-x0-9]+\) -** sb\tzero,5\([a-x0-9]+\) -** sb\tzero,6\([a-x0-9]+\) -** ret -*/ -void foo0_7 (void *p) -{ - __builtin_memset (p, 0, 7); -} - -/* -** foo1_1: -** li\t[a-x0-9]+,1 -** sb\t[a-x0-9]+,0\([a-x0-9]+\) -** ret -*/ -void foo1_1 (void *p) -{ - __builtin_memset (p, 1, 1); -} - -/* -** foo1_5: -** li\t[a-x0-9]+,1 -** sb\t[a-x0-9]+,0\([a-x0-9]+\) -** sb\t[a-x0-9]+,1\([a-x0-9]+\) -** sb\t[a-x0-9]+,2\([a-x0-9]+\) -** sb\t[a-x0-9]+,3\([a-x0-9]+\) -** sb\t[a-x0-9]+,4\([a-x0-9]+\) -** ret -*/ -void foo1_5 (void *p) -{ - __builtin_memset (p, 1, 5); -} diff --git a/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c new file mode 100644 index 0000000000000..2e53a7ecc3e71 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/xtheadvector/pr114194.c @@ -0,0 +1,56 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv32gc_xtheadvector -O2" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc_xtheadvector -O2" { target { rv64 } } } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +/* +** foo0_1: +** sb\tzero,0\([a-x0-9]+\) +** ret +*/ +void foo0_1 (void *p) +{ + __builtin_memset (p, 0, 1); +} + +/* +** foo0_7: +** sb\tzero,0\([a-x0-9]+\) +** sb\tzero,1\([a-x0-9]+\) +** sb\tzero,2\([a-x0-9]+\) +** sb\tzero,3\([a-x0-9]+\) +** sb\tzero,4\([a-x0-9]+\) +** sb\tzero,5\([a-x0-9]+\) +** sb\tzero,6\([a-x0-9]+\) +** ret +*/ +void foo0_7 (void *p) +{ + __builtin_memset (p, 0, 7); +} + +/* +** foo1_1: +** li\t[a-x0-9]+,1 +** sb\t[a-x0-9]+,0\([a-x0-9]+\) +** ret +*/ +void foo1_1 (void *p) +{ + __builtin_memset (p, 1, 1); +} + +/* +** foo1_5: +** li\t[a-x0-9]+,1 +** sb\t[a-x0-9]+,0\([a-x0-9]+\) +** sb\t[a-x0-9]+,1\([a-x0-9]+\) +** sb\t[a-x0-9]+,2\([a-x0-9]+\) +** sb\t[a-x0-9]+,3\([a-x0-9]+\) +** sb\t[a-x0-9]+,4\([a-x0-9]+\) +** ret +*/ +void foo1_5 (void *p) +{ + __builtin_memset (p, 1, 5); +}