From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 9FD003852C6F for ; Fri, 18 Nov 2022 11:14:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9FD003852C6F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu Received: by mail-lf1-x135.google.com with SMTP id a29so7649752lfj.9 for ; Fri, 18 Nov 2022 03:14:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eA7A8TIJ1c76c7UKZjs8mueygAGswufN04Pgwnrv28Q=; b=sED/UxmT7iNFtE84FqbeKNsMnKTSbd8Tmii04YI1uWfbGyNsvP3pf0AIsVak3v9e+Y 4L92mN1XmclechK1PrAtqG1g5cgnDFqu942HcCfsJ9FwvsAWUutko0GU8Cv2ZQJKfoH2 z2UcnPYNyPd2NdnRlNR6N7ZinPaPm2aq7dOReEvz7ZOvEvH+m+tiOYGgbgvSZ9STBHFM sOHLIxDCUYKHKCT4NR4Nl1rQJgXWNNaBS/w5YrrjfhC8tEAXSimKWrLvvKiANZnLoQbM i4nv7hkmGGZFWp1AvlSoIBtiX6HTXFju8KeaWqaxPt6ImMnc1VW1m5bgyp9oY+rJhNZs AGVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eA7A8TIJ1c76c7UKZjs8mueygAGswufN04Pgwnrv28Q=; b=z/JRAi6Ef+JSld0TBX6MkniTSYaIQCM22dykQRAxWbVPSQokueRhHOMafE7b2426NQ 9gN2GcaOHiwidZs6PywaSaEn/+nkjCG9ZFU7/Op4iRhcLiXlFSpqXk0aq9PyvYB7LidB 9u8HkBySgypuXIgm9C9idPuZAXgT57/Y7/u7Kk3wI9/Bifj4sJFTHHBnIzeg3RDUQNEs z0gEENPfd4/gN1+uDyl7kCg4JN4vbWBB9n9Y9m67vR31ve8/LwEvNRXr9vR47sVcFt8I rmfpRFGNQ1PcitNNZKIVUa0YNKmwLNnasJSvEhYv/WpQiZNUSLAr1zSpZNJADK2cmXu2 IhTg== X-Gm-Message-State: ANoB5pmuTEaNccEoIeMCJyPl349qtHVBFQGoOdjdDgdaad48L+x+X99X hI0SWRmXHPwIZFNNtAHRvdgTJ+WYgtcFCkes X-Google-Smtp-Source: AA0mqf6kPIgFfu6ge/+UZWaEJf70ct/ZkqH5CPsvH1MjLa5LxKiMz1gQGiMGb6W9duZtWr5yumTIpQ== X-Received: by 2002:a05:6512:12c9:b0:4af:aa4c:fc8c with SMTP id p9-20020a05651212c900b004afaa4cfc8cmr2131122lfg.653.1668770075821; Fri, 18 Nov 2022 03:14:35 -0800 (PST) Received: from ubuntu-focal.. ([2a01:4f9:3a:1e26::2]) by smtp.gmail.com with ESMTPSA id y21-20020ac24215000000b004947984b385sm618291lfh.87.2022.11.18.03.14.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 03:14:35 -0800 (PST) From: Philipp Tomsich To: gcc-patches@gcc.gnu.org Cc: Kito Cheng , Palmer Dabbelt , Vineet Gupta , Jeff Law , Christoph Muellner , Philipp Tomsich Subject: [PATCH v2 2/2] RISC-V: Handle "(a & twobits) == singlebit" in branches using Zbs Date: Fri, 18 Nov 2022 12:10:01 +0100 Message-Id: <20221118111001.1488517-3-philipp.tomsich@vrull.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221118111001.1488517-1-philipp.tomsich@vrull.eu> References: <20221118111001.1488517-1-philipp.tomsich@vrull.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,JMQ_SPF_NEUTRAL,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 List-Id: Use Zbs when generating a sequence for "if ((a & twobits) == singlebit) ..." that can be expressed as bexti + bexti + andn. gcc/ChangeLog: * config/riscv/bitmanip.md (*branch_mask_twobits_equals_singlebit): Handle "if ((a & T) == C)" using Zbs, when T has 2 bits set and C has one of these tow bits set. * config/riscv/predicates.md (const_twobits_not_arith_operand): New predicate. gcc/testsuite/ChangeLog: * gcc.target/riscv/zbs-if_then_else-01.c: New test. Signed-off-by: Philipp Tomsich --- Changes in v2: - Convert the FAIL into a gcc_assert. - Merge the !SMALL_OPERAND check into a new predicate. - Some of the predicates moved into the other patch of the series due to the order the reviews were processed. gcc/config/riscv/bitmanip.md | 42 +++++++++++++++++++ gcc/config/riscv/predicates.md | 5 +++ .../gcc.target/riscv/zbs-if_then_else-01.c | 20 +++++++++ 3 files changed, 67 insertions(+) create mode 100644 gcc/testsuite/gcc.target/riscv/zbs-if_then_else-01.c diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md index d7c64270c00..be53aecbb13 100644 --- a/gcc/config/riscv/bitmanip.md +++ b/gcc/config/riscv/bitmanip.md @@ -517,3 +517,45 @@ (define_insn_and_split "*andi_extrabit" operands[3] = GEN_INT (bits | topbit); operands[4] = GEN_INT (~topbit); }) + +;; IF_THEN_ELSE: test for 2 bits of opposite polarity +(define_insn_and_split "*branch_mask_twobits_equals_singlebit" + [(set (pc) + (if_then_else + (match_operator 1 "equality_operator" + [(and:X (match_operand:X 2 "register_operand" "r") + (match_operand:X 3 "const_twobits_not_arith_operand" "i")) + (match_operand:X 4 "single_bit_mask_operand" "i")]) + (label_ref (match_operand 0 "" "")) + (pc))) + (clobber (match_scratch:X 5 "=&r")) + (clobber (match_scratch:X 6 "=&r"))] + "TARGET_ZBS && TARGET_ZBB" + "#" + "&& reload_completed" + [(set (match_dup 5) (zero_extract:X (match_dup 2) + (const_int 1) + (match_dup 8))) + (set (match_dup 6) (zero_extract:X (match_dup 2) + (const_int 1) + (match_dup 9))) + (set (match_dup 6) (and:X (not:X (match_dup 6)) (match_dup 5))) + (set (pc) (if_then_else (match_op_dup 1 [(match_dup 6) (const_int 0)]) + (label_ref (match_dup 0)) + (pc)))] +{ + unsigned HOST_WIDE_INT twobits_mask = UINTVAL (operands[3]); + unsigned HOST_WIDE_INT singlebit_mask = UINTVAL (operands[4]); + + /* We should never see an unsatisfiable condition. */ + gcc_assert (twobits_mask & singlebit_mask); + + int setbit = ctz_hwi (singlebit_mask); + int clearbit = ctz_hwi (twobits_mask & ~singlebit_mask); + + operands[1] = gen_rtx_fmt_ee (GET_CODE (operands[1]) == NE ? EQ : NE, + mode, operands[6], GEN_INT(0)); + + operands[8] = GEN_INT (setbit); + operands[9] = GEN_INT (clearbit); +}) diff --git a/gcc/config/riscv/predicates.md b/gcc/config/riscv/predicates.md index 3300c0e36eb..9e2f7c9b6b3 100644 --- a/gcc/config/riscv/predicates.md +++ b/gcc/config/riscv/predicates.md @@ -296,6 +296,11 @@ (define_predicate "const_twobits_operand" (and (match_code "const_int") (match_test "popcount_hwi (UINTVAL (op)) == 2"))) +(define_predicate "const_twobits_not_arith_operand" + (and (match_code "const_int") + (and (not (match_operand 0 "arith_operand")) + (match_operand 0 "const_twobits_operand")))) + ;; A CONST_INT operand that fits into the unsigned half of a ;; signed-immediate after the top bit has been cleared (define_predicate "uimm_extra_bit_operand" diff --git a/gcc/testsuite/gcc.target/riscv/zbs-if_then_else-01.c b/gcc/testsuite/gcc.target/riscv/zbs-if_then_else-01.c new file mode 100644 index 00000000000..d249a841ff9 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zbs-if_then_else-01.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc_zbb_zbs -mabi=lp64" } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-O1" } } */ + +void g(); + +void f1 (long a) +{ + if ((a & ((1ul << 33) | (1 << 4))) == (1ul << 33)) + g(); +} + +void f2 (long a) +{ + if ((a & 0x12) == 0x10) + g(); +} + +/* { dg-final { scan-assembler-times "bexti\t" 2 } } */ +/* { dg-final { scan-assembler-times "andn\t" 1 } } */ -- 2.34.1