From patchwork Mon Apr 15 12:43:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Dapp X-Patchwork-Id: 1923717 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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=i4j9b+uQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4VJ6Kl1PPKz1yY4 for ; Mon, 15 Apr 2024 22:43:39 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7E5133858D32 for ; Mon, 15 Apr 2024 12:43:37 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 832383858C78 for ; Mon, 15 Apr 2024 12:43:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 832383858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 832383858C78 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::634 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713184996; cv=none; b=dhL2f5TOt9o6XA6jMYISLASJj2HJZdL/V2Harxfo57ygKKBGONIG6M+ASGXNaAcfxnThAE/S95XjKLfe3J/SJ5MtUss52iieR1/gFdaVr7bc9l/i8IYfp70UvLt+reVMGxoB2cGqd5NCLBxiaElpJRFDUE6UfzCfMq+48E3bObk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713184996; c=relaxed/simple; bh=6H+EL0wu4U4hojxvGX1k6LEWcsmdX9mC7ZI/61LNqF0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=YTTtYX9IlXlnsDGwAoRdVwoLlNjAtzjyyjKZM3w9RoYCOHXaBUVPaHOyBwFVIipnKkeASReuER0TCKnBI0G3iLCn3MgO3iZbSsavWZ5ixz21fsTkkgQ+XICOBOVJo83AxrA4v8p7Nusa8KK2wy80h+pEivMuXkdryMRWJz++wIA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a53f130b0e6so72353866b.1 for ; Mon, 15 Apr 2024 05:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713184991; x=1713789791; darn=gcc.gnu.org; h=content-transfer-encoding:subject:from:to:content-language:cc :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=e8DMs2pQv9h9GfYTBEWM9QPGygn3TFMsgCVERAszFII=; b=i4j9b+uQ3U3BkiREKuPZD0Nrzd5NeWnbvE1Qi2UPIAM/3UolG7G74OlNcuhF11qysC XDbNPMQEa3DtoS4S8BX+MeSbYBPSLDCfXmHIckMFMZ50JOEnyCmJ61VW9sQ61ppDsPS0 B2/s/Fv1wUPM2YUiyRx04Zjd2DtqhF/LaWw9/IVztmiXPabiQI4xJMsAKAx9HIbbcGgV n7fXk7m9Zw7Zft4tTTqxEVvJdrImBvFjcSUgBL1kx0khbzzhgfqRZW7VEtwwERlresYe j+Yy5MpZ7vfRn5TFNE9Rz3B0qs3xot3SfU8YxYHEWaNjPRYip1KHuhricgfmBeNIfzAy 8OtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713184991; x=1713789791; h=content-transfer-encoding:subject:from:to:content-language:cc :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=e8DMs2pQv9h9GfYTBEWM9QPGygn3TFMsgCVERAszFII=; b=PyhdFxxl6WsPsp7hkbDcnj8PA9diaKxDDjRyTxieal2RcMQuVnVSrmBkcC7g5okm6d KDSfeGIkuebGSCmegzH5IjzQUBBjjSWky2oHyHttk4lkfh3xufN4OYk+UjUj9b39FggW Cxz//xCc+x6mT8XI0jdfHAphWMDREdErmLCqb96fCBDuB6mFhVe+nYBgpSixYnXwZRET 5cVmBt39eVCNH1KfWmP3znEPHeEkSRAcFHANjhhG26VKKu5EGG1JDdm6LWhTwk6tPQzK mfFSmI0Q3kZfUiyAliZ4JG6AgqSL/6z+lb1jnOJfetDv0tQpkqW11Hjvz2VaLNGdxJjy BJ9w== X-Gm-Message-State: AOJu0Yy23pWQSKu5KqtIq5tDNKBaBuiC6PKsg9oHw6aa+l5/2Ba+xE+C 02glLoQG9WwD2JOTRFme+RqjeV2m86mPgwns8f5fFgNg0LScAcOX8I+X1A== X-Google-Smtp-Source: AGHT+IFPN+MweluaXcee5vUF8TWzYEbaTGqzynjOsGbOH8o6vtO2R13022aHZ4XDMowWZ4CjxSf4BA== X-Received: by 2002:a17:906:2448:b0:a52:6ba1:af45 with SMTP id a8-20020a170906244800b00a526ba1af45mr1304374ejb.35.1713184991348; Mon, 15 Apr 2024 05:43:11 -0700 (PDT) Received: from [192.168.1.23] (ip-149-172-150-237.um42.pools.vodafone-ip.de. [149.172.150.237]) by smtp.gmail.com with ESMTPSA id kf20-20020a17090776d400b00a51e9b299b9sm5396996ejc.55.2024.04.15.05.43.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Apr 2024 05:43:11 -0700 (PDT) Message-ID: <79e9c967-fda0-486e-9bec-e0ccaa9e7b3c@gmail.com> Date: Mon, 15 Apr 2024 14:43:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: rdapp.gcc@gmail.com Content-Language: en-US To: gcc-patches , palmer , Kito Cheng , jeffreyalaw , "juzhe.zhong@rivai.ai" From: Robin Dapp Subject: [PATCH] RISC-V: Add VLS to mask vec_extract [PR114668]. X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, 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 Hi, this adds the missing VLS modes to the mask extract expanders. I found a dump scan difficult to create reliably so I just kept the PR's run test case. Regtested on rv64gcv. Regards Robin gcc/ChangeLog: PR target/114668 * config/riscv/autovec.md: Add VLS. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/autovec/pr114668.c: New test. --- gcc/config/riscv/autovec.md | 4 +-- .../gcc.target/riscv/rvv/autovec/pr114668.c | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/autovec/pr114668.c diff --git a/gcc/config/riscv/autovec.md b/gcc/config/riscv/autovec.md index 3b32369f68c..aa1ae0fe075 100644 --- a/gcc/config/riscv/autovec.md +++ b/gcc/config/riscv/autovec.md @@ -1427,7 +1427,7 @@ (define_expand "vec_extract" (define_expand "vec_extractqi" [(set (match_operand:QI 0 "register_operand") (vec_select:QI - (match_operand:VB 1 "register_operand") + (match_operand:VB_VLS 1 "register_operand") (parallel [(match_operand 2 "nonmemory_operand")])))] "TARGET_VECTOR" @@ -1453,7 +1453,7 @@ (define_expand "vec_extractqi" (define_expand "vec_extractbi" [(set (match_operand:QI 0 "register_operand") (vec_select:QI - (match_operand:VB 1 "register_operand") + (match_operand:VB_VLS 1 "register_operand") (parallel [(match_operand 2 "nonmemory_operand")])))] "TARGET_VECTOR" diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr114668.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr114668.c new file mode 100644 index 00000000000..3a13c3c0012 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr114668.c @@ -0,0 +1,35 @@ +/* { dg-do run } */ +/* { dg-require-effective-target riscv_v } */ +/* { dg-options { -O3 -fno-vect-cost-model -march=rv64gcv -mabi=lp64d } } */ + +char a; +int b; +short e[14]; +char f[4][12544]; +_Bool c[4][5]; + +__attribute__ ((noipa)) +void foo (int a) +{ + if (a != 1) + __builtin_abort (); +} + +int main () +{ + for (int i = 0; i < 4; ++i) + for (int l = 0; l < 15; ++l) + for (int m = 0; m < 15; ++m) + f[i][l * m] = 3; + for (int j = 0; j < 4; j += 1) + for (int k = 3; k < 13; k += 3) + for (_Bool l = 0; l < 1; l = 1) + for (int m = 0; m < 4; m += 1) + { + a = 0; + b -= e[k]; + c[j][m] = f[j][6]; + } + for (long i = 2; i < 4; ++i) + foo (c[3][3]); +}