From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by sourceware.org (Postfix) with ESMTPS id 2FD153857BAC for ; Tue, 24 May 2022 22:52:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2FD153857BAC 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-x12d.google.com with SMTP id bq30so33283253lfb.3 for ; Tue, 24 May 2022 15:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N2wRijQKjfdOlJ6HI3Y9oz1u0pOg+cxwSGz4zse0y34=; b=dLfrQ+n9ZYWX6+ozQ5ZKgd9cdjlM+QX4bT7Ba34T4bCQ4D5XZvJsGfNIvdvMBcCxx1 d+8dlxlb1cv4LnpW2zInMA8aEUPWEoJFCFGh8qyD+tL+WY5I+CN7b2deYBGxMjglfnT6 KCq7NnQCTonXj2D90PfFIhWd+RJ6KbNvlO4+wJ3qjFrxrFmJpoafAkHC99IZp0cBDFE2 1cjqREmZV3slcuSqlyPB6Pe1z97T5xLsPytchAqR0+op0PzrTG6LS2e5Fdv84WLOjFUh WnmWVdbXweO0sczh1DV8dUXjFqDsR9qYOAIozZZ6gjePHmIypLTwzCeWT1KU+kxBxb0x +8Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N2wRijQKjfdOlJ6HI3Y9oz1u0pOg+cxwSGz4zse0y34=; b=SVI4crDHrlK4ICb6Efy2/fpqVRtpVIkdbQwrUTvl/JxUowPe0H3zBTfKHlhdSNRKo8 boJYzO1CxuhZXTLKBzfhFAGgGEC6+0c8y2iW0i6Xsln40x0wD1rJISlL9G0LgKW8PPw6 /ZZhnDbvOhyOHewHqQBIBnMm0HnchqIL5UvdHQHJMnvbpwehae5KgNi2oSZ1MvcgVqly iStiv9kw5qjPuifoiXo0QGXqYjHSCEDaSziZpaakgdVEA8mJrVxC3pZQJk1V7UbTDxdD ADcOrFubfjnpkMFr8UBKWK/PPnEMvjbzJUuxsP4iOf85yaA2oH1C3G0cOsoHGkoU9Rt9 J7Zw== X-Gm-Message-State: AOAM533rRBq6M13N4KHld9I3065E2Dmn1S8WYPrwyfSymGRNS7Z7ZTxZ 7Nzeeu28cDXcxZ/3nNTONJgLzXroivGOkD/S X-Google-Smtp-Source: ABdhPJxmPKWXaW55AXbuN8L0rHqx5zqGp/5SgvazlVcRxnAb4RmK/KDtb+AIMa+vPmDXn/xxXuYQoQ== X-Received: by 2002:a05:6512:3c3:b0:472:5211:ad3 with SMTP id w3-20020a05651203c300b0047252110ad3mr21361107lfp.650.1653432728514; Tue, 24 May 2022 15:52:08 -0700 (PDT) Received: from ubuntu-focal.. ([2a01:4f9:3a:1e26::2]) by smtp.gmail.com with ESMTPSA id k8-20020a2ea288000000b0024f3d1dae84sm2750660lja.12.2022.05.24.15.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 May 2022 15:52:08 -0700 (PDT) From: Philipp Tomsich To: gcc-patches@gcc.gnu.org Cc: Andrew Waterman , Palmer Dabbelt , Kito Cheng , Manolis Tsamis , Vineet Gupta , Christoph Muellner , Philipp Tomsich Subject: [PATCH v1 3/3] RISC-V: Split "(a & (1UL << bitno)) ? 0 : 1" to bext + xori Date: Wed, 25 May 2022 00:51:56 +0200 Message-Id: <20220524225156.4026293-3-philipp.tomsich@vrull.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220524225156.4026293-1-philipp.tomsich@vrull.eu> References: <20220524225156.4026293-1-philipp.tomsich@vrull.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 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, 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: , X-List-Received-Date: Tue, 24 May 2022 22:52:12 -0000 We avoid reassociating "(~(a >> BIT_NO)) & 1" into "((~a) >> BIT_NO) & 1" by splitting it into a zero-extraction (bext) and an xori. This both avoids burning a register on a temporary and generates a sequence that clearly captures 'extract bit, then invert bit'. This change improves the previously generated srl a0,a0,a1 not a0,a0 andi a0,a0,1 into bext a0,a0,a1 xori a0,a0,1 Signed-off-by: Philipp Tomsich gcc/ChangeLog: * config/riscv/bitmanip.md: Add split covering "(a & (1 << BIT_NO)) ? 0 : 1". gcc/testsuite/ChangeLog: * gcc.target/riscv/zbs-bext.c: Add testcases. * gcc.target/riscv/zbs-bexti.c: Add testcases. --- gcc/config/riscv/bitmanip.md | 13 +++++++++++++ gcc/testsuite/gcc.target/riscv/zbs-bext.c | 10 ++++++++-- gcc/testsuite/gcc.target/riscv/zbs-bexti.c | 10 ++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md index 5d7c20e9fdc..c4b61880e0c 100644 --- a/gcc/config/riscv/bitmanip.md +++ b/gcc/config/riscv/bitmanip.md @@ -365,3 +365,16 @@ (define_split "TARGET_ZBS" [(set (match_dup 0) (zero_extract:GPR (match_dup 1) (const_int 1) (match_dup 2))) (set (match_dup 0) (plus:GPR (match_dup 0) (const_int -1)))]) + +;; Split for "(a & (1 << BIT_NO)) ? 0 : 1": +;; We avoid reassociating "(~(a >> BIT_NO)) & 1" into "((~a) >> BIT_NO) & 1", +;; so we don't have to use a temporary. Instead we extract the bit and then +;; invert bit 0 ("a ^ 1") only. +(define_split + [(set (match_operand:X 0 "register_operand") + (and:X (not:X (lshiftrt:X (match_operand:X 1 "register_operand") + (subreg:QI (match_operand:X 2 "register_operand") 0))) + (const_int 1)))] + "TARGET_ZBS" + [(set (match_dup 0) (zero_extract:X (match_dup 1) (const_int 1) (match_dup 2))) + (set (match_dup 0) (xor:X (match_dup 0) (const_int 1)))]) diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bext.c b/gcc/testsuite/gcc.target/riscv/zbs-bext.c index 8de9c5a167c..a8aadb60390 100644 --- a/gcc/testsuite/gcc.target/riscv/zbs-bext.c +++ b/gcc/testsuite/gcc.target/riscv/zbs-bext.c @@ -23,16 +23,22 @@ long bext64_1(long a, char bitno) long bext64_2(long a, char bitno) { - return (a & (1UL << bitno)) ? 0 : -1; + return (a & (1UL << bitno)) ? 0 : 1; } long bext64_3(long a, char bitno) +{ + return (a & (1UL << bitno)) ? 0 : -1; +} + +long bext64_4(long a, char bitno) { return (a & (1UL << bitno)) ? -1 : 0; } /* { dg-final { scan-assembler-times "bexti\t" 1 } } */ -/* { dg-final { scan-assembler-times "bext\t" 4 } } */ +/* { dg-final { scan-assembler-times "bext\t" 5 } } */ +/* { dg-final { scan-assembler-times "xori\t|snez\t" 1 } } */ /* { dg-final { scan-assembler-times "addi\t" 1 } } */ /* { dg-final { scan-assembler-times "neg\t" 1 } } */ /* { dg-final { scan-assembler-not "andi" } } */ \ No newline at end of file diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bexti.c b/gcc/testsuite/gcc.target/riscv/zbs-bexti.c index 8182a61707d..aa13487b357 100644 --- a/gcc/testsuite/gcc.target/riscv/zbs-bexti.c +++ b/gcc/testsuite/gcc.target/riscv/zbs-bexti.c @@ -12,14 +12,20 @@ long bexti64_1(long a, char bitno) long bexti64_2(long a, char bitno) { - return (a & (1UL << BIT_NO)) ? 0 : -1; + return (a & (1UL << BIT_NO)) ? 0 : 1; } long bexti64_3(long a, char bitno) +{ + return (a & (1UL << BIT_NO)) ? 0 : -1; +} + +long bexti64_4(long a, char bitno) { return (a & (1UL << BIT_NO)) ? -1 : 0; } -/* { dg-final { scan-assembler-times "bexti\t" 3 } } */ +/* { dg-final { scan-assembler-times "bexti\t" 4 } } */ +/* { dg-final { scan-assembler-times "xori\t|snez\t" 1 } } */ /* { dg-final { scan-assembler-times "addi\t" 1 } } */ /* { dg-final { scan-assembler-times "neg\t" 1 } } */ \ No newline at end of file -- 2.34.1