From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id 9DB29386D619 for ; Fri, 31 May 2024 15:07:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9DB29386D619 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 9DB29386D619 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717168038; cv=none; b=O1/Vf+yT84pTHLwWN91+2y4B2cOa3qOaOUkiJhKC84RTSPYhBbhb/jB620wJ0ZuKvBvR1C3e/q9+MHvSbwmifj0d8LtiHRVGH+3RSvTPR59t65/Ovqm7sXO4JevQRSD9YRqIjSsQKH9+tT86j8CFbIrq9VgZ5zpnoZ39KjQXXOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717168038; c=relaxed/simple; bh=aYvr4NKgdV5iWvV/Vgohh9X2WwgNXc5XRaMo4CzAEFw=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=OawXTfLr2v2qa4QmRldUL/HmpgH9e1WaRl/2dtKSdxHUzZt6EhkCR2DtzbltsMtil8eCsmbfE6TPs/XHEbqAqqCbpBEPZitvTMDkyKwUtWaU8cVzMEajwRiQIcyicVnpaOpDqSlelalmMnsuHEWRz3MoKgiIYWhbUP02UaX3dTI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a621cb07d8fso237619366b.2 for ; Fri, 31 May 2024 08:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717168033; x=1717772833; 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=xR/JTHY4rI/qtyQQGJomwhRaco1BXH3y1eenL4O1t4s=; b=NFzFsOzwUPYHYZw/IurfXBMpy4HhCG2ShGQtamOcQAS6fCAkoil8QCg+FvMp08Bfwz Sw27VPJ3EIiIFdZv6Rr2/hVWeydOe4taARpMZ2DpkvuWoorY+Svtv/zaRfYgvZQg5An5 begmtQ61RIDUyWJpSJq9L4GHRBXBb4+IW8213RqWSKTJLtjBb5R+oYBnhkxnV1R5FIN/ OaW9CFpviX46lvvM4CflErzG0+sqInpTRE7C+2oZ3iEMFCWgwFQKnC5auFpQ7ceq/mQZ LQgQLalG486sWyC0cnn/9P8w9BQDVufJtFMrl9YXaS1Ch5kjFmIsfCfEytWeUUlsPQrI fPxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717168033; x=1717772833; 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=xR/JTHY4rI/qtyQQGJomwhRaco1BXH3y1eenL4O1t4s=; b=XigpfQIEYYSNoISBza7143FkQvWb13+AyaLslzRAVpFcdpdX3QHTsNlNeOER4J77Pr xcM6TIKkb4mRskTtPkbW2dHzxwdXb+1CrA/1DTm3LOLrTVKCPVXEZ9ReSZnGGiNOG7yB nYHLnc9mJ5Dae3nVcy6v7MwyMWNBu9+NjOGhOnk947PZj7hM9QFN5fbYP7Q9b6P0VW53 l/ybk6mgsD0xaRlmpxE1ZnV+nKhotRdywA3H+apPGHvwQ/6z0NKIETb7Prf0RI5BycRB lPYCeYeam1TQ1udPCzOLCc//sWmrGu4OKW2JyvfhHxAgYJGGnVjNZl9NhRtgocSa5kOI ZPLQ== X-Gm-Message-State: AOJu0YylmnDuYtBQztkWZt0k15DUbetSQR/Xo1RHzeABVA2NqDI5fO2R pC/ElQYve0f9256tjZ+A23OA9erE/QOeJuNgzO9u+PzO3uf1zixw7Jrpbg== X-Google-Smtp-Source: AGHT+IEqAuS9lguxSTaU3HPyhUh3pvwt+jgYIiAp5BikAlIzOif1huBQ0BCUNg4kY76ZfOf4xfiQDA== X-Received: by 2002:a17:906:f348:b0:a59:efd3:9d with SMTP id a640c23a62f3a-a68220499a6mr178289866b.58.1717168032612; Fri, 31 May 2024 08:07:12 -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 a640c23a62f3a-a67e73fc1b3sm95978366b.74.2024.05.31.08.07.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 May 2024 08:07:12 -0700 (PDT) Message-ID: <7677685f-9436-4b92-a407-5973f433fd97@gmail.com> Date: Fri, 31 May 2024 17:07:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: rdapp.gcc@gmail.com, palmer , Kito Cheng , "juzhe.zhong@rivai.ai" , jeffreyalaw Content-Language: en-US To: gcc-patches From: Robin Dapp Subject: [PATCH] RISC-V: Add min/max patterns for ifcvt. Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-9.1 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,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 List-Id: Hi, ifcvt likes to emit (set (if_then_else) (ge (reg 1) (reg2)) (reg 1) (reg 2)) which can be recognized as min/max patterns in the backend. This patch adds such patterns and the respective iterators as well as a test. This depends on the generic ifcvt change. Regtested on rv64gcv_zvfh_zicond_zbb_zvbb. Regards Robin gcc/ChangeLog: * config/riscv/bitmanip.md (*_cmp_3): New min/max ifcvt pattern. * config/riscv/iterators.md (minu): New iterator. * config/riscv/riscv.cc (riscv_noce_conversion_profitable_p): Remove riscv-specific adjustment. gcc/testsuite/ChangeLog: * gcc.target/riscv/zbb-min-max-04.c: New test. --- gcc/config/riscv/bitmanip.md | 13 +++++ gcc/config/riscv/iterators.md | 8 ++++ gcc/config/riscv/riscv.cc | 3 -- .../gcc.target/riscv/zbb-min-max-04.c | 47 +++++++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-min-max-04.c diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md index 8769a6b818b..11102985796 100644 --- a/gcc/config/riscv/bitmanip.md +++ b/gcc/config/riscv/bitmanip.md @@ -547,6 +547,19 @@ (define_insn "*3" "\t%0,%1,%z2" [(set_attr "type" "")]) +;; Provide a minmax pattern for ifcvt to match. +(define_insn "*_cmp_3" + [(set (match_operand:X 0 "register_operand" "=r") + (if_then_else:X + (bitmanip_minmax_cmp_op + (match_operand:X 1 "register_operand" "r") + (match_operand:X 2 "register_operand" "r")) + (match_dup 1) + (match_dup 2)))] + "TARGET_ZBB" + "\t%0,%1,%z2" + [(set_attr "type" "")]) + ;; Optimize the common case of a SImode min/max against a constant ;; that is safe both for sign- and zero-extension. (define_insn_and_split "*minmax" diff --git a/gcc/config/riscv/iterators.md b/gcc/config/riscv/iterators.md index 8a9d1986b4a..2f7be6e83c1 100644 --- a/gcc/config/riscv/iterators.md +++ b/gcc/config/riscv/iterators.md @@ -202,6 +202,14 @@ (define_code_iterator bitmanip_bitwise [and ior]) (define_code_iterator bitmanip_minmax [smin umin smax umax]) +(define_code_iterator bitmanip_minmax_cmp_op [lt ltu le leu ge geu gt gtu]) + +; Map a comparison operator to a min or max. +(define_code_attr bitmanip_minmax_cmp_insn [(lt "min") (ltu "minu") + (le "min") (leu "minu") + (ge "max") (geu "maxu") + (gt "max") (gtu "maxu")]) + (define_code_iterator clz_ctz_pcnt [clz ctz popcount]) (define_code_iterator bitmanip_rotate [rotate rotatert]) diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 13cd61a4a22..d17c0a260a2 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -4009,9 +4009,6 @@ riscv_noce_conversion_profitable_p (rtx_insn *seq, { struct noce_if_info riscv_if_info = *if_info; - riscv_if_info.original_cost -= COSTS_N_INSNS (2); - riscv_if_info.original_cost += insn_cost (if_info->jump, if_info->speed_p); - /* Hack alert! When `noce_try_store_flag_mask' uses `cstore4' to emit a conditional set operation on DImode output it comes up with a sequence such as: diff --git a/gcc/testsuite/gcc.target/riscv/zbb-min-max-04.c b/gcc/testsuite/gcc.target/riscv/zbb-min-max-04.c new file mode 100644 index 00000000000..ebf1889075d --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zbb-min-max-04.c @@ -0,0 +1,47 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -march=rv64gc_zicond_zbb -mabi=lp64d" } */ +/* { dg-skip-if "" { *-*-* } { "-finline-functions" "-funroll-loops" "-ftracer" } } */ + +typedef int move_s; + +int +remove_one_fast (int *move_ordering, const int num_moves, int mark) +{ + int i, best = -1000000; + int tmp = 0; + + for (i = mark; i < num_moves; i++) + { + if (move_ordering[i] > best) + { + best = move_ordering[i]; + tmp = i; + } + } + + return tmp; +} + +/* { dg-final { scan-assembler-times "max\t" 1 } } */ +/* { dg-final { scan-assembler-times "czero.nez" 2 } } */ +/* { dg-final { scan-assembler-times "czero.eqz" 2 } } */ + +int +remove_one_fast2 (int *move_ordering, const int num_moves, int mark) +{ + int i, best = -1000000; + int tmp = 0; + + for (i = mark; i < num_moves; i++) + { + if (move_ordering[i] < best) + { + best = move_ordering[i]; + tmp = i; + } + } + + return tmp; +} + +/* { dg-final { scan-assembler-times "min\t" 1 } } */ -- 2.45.1