From patchwork Tue Nov 28 07:38:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Wei X-Patchwork-Id: 170574 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3743491vqx; Mon, 27 Nov 2023 23:39:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGWK+hETMDLPJR2MHVWp/VPdZk1KIcZE6IsjzfGlTMHL42J/eOQczNG+ftDaGKICo9gBlq+ X-Received: by 2002:a0c:ec0f:0:b0:67a:225f:7722 with SMTP id y15-20020a0cec0f000000b0067a225f7722mr12546886qvo.51.1701157154226; Mon, 27 Nov 2023 23:39:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701157154; cv=pass; d=google.com; s=arc-20160816; b=u/I9zn7vqY/FG/eYpzn8kkQconCKk7jkF+VNkuOJKZROBmFPJ+2vbueAPmzUbifcr9 Fp2s1ychQXeP5PtBuAmMMefQwaKQb/9sZZCJgDCsod1LQvewfwb4Pygr5uD61vdfJ2cv HVs1WON4kPWKk9Cmiwg2mFf/DCGno8S9rH8jJe5/DVzSYuw7pOV+r9TuuN/XN8R/kqCX UcQhKCJqGZdfOL/jVQlBlWnQjZb+6iM1IuHKaFy0Mx6f3vnAOj4oZ0tgwrrPU/3HbbDy ekYyci7F/45pdOBgzIid6GoQ22t1o/TXoqBRT8/2+5oE9e/okwxCEASXc0aAQdozKxoz m7dw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:arc-filter :dmarc-filter:delivered-to; bh=pJZmu2GS3May/v6HYs+9cca6XTeeVXNOhwEaffVrVMQ=; fh=qByQSPvg+/wD954+0Cj99cs2VLzuSy0bdUhDlHLuDa4=; b=yKWKX2DSzzk1mPmCO6U4sLoeSSNdkXWtJvTRWbkhfMXSdEcndN0NKH8lN1zPcol2tl n4r/aMO/9B4XmUPgew7FM/Tdbc6OHFkbrXOxzEKFI4PA2vTFSaortZwNpG/87b+HP0qo 8Dk4sB28u7oeSlFuiAjwf5S1juxtham+QSYmJN9FYUPqYa9qf8CAaYbz2IvMGnpQ5Emi K2S78Q5vZKkC/t9OXX32o6wMJktvfNmss17hCdS8dIgIALozCEUC3hgHmxfG2POJpr4U R2G6EJNtZ5JAxd4SDtZJjPDW6F+GwkjHPVSJwRQHtOiww2EsFau68EBhyfIJUIjvS5VK LloA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i2-20020a056214030200b0067a148bd432si8928109qvu.366.2023.11.27.23.39.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 23:39:14 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D51553857BAA for ; Tue, 28 Nov 2023 07:39:13 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 609D33858D38 for ; Tue, 28 Nov 2023 07:38:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 609D33858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 609D33858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701157130; cv=none; b=AbIAzxNb24KagcEdfVNtvV5cKd6m042YdRWTHGNmXZ7ioSAEcvcf6nYVs1c+TkyhrWTEn2g1WX+qN3a/EgX1EiHMTWGfWlksnE4cIoASaQvw4SY+YnhzdZpwoHxwpL8vlBgWbocmEdtmuThUx96xMphROWeZH6oMacXfMkGwLRE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701157130; c=relaxed/simple; bh=GDTPsvZ5XixkQPLN4EYYZgW4GDAP12QaeKEA1EjhJls=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=iK8jJSA11k5f98I3hCLMNhiE1cV/a57aWdSqTxvGTwWQI/iVQqHbOVTwn8g1YaoNFjpxi1tiDey7Cmfb+ZMEzc0Zl3tO2AsizDlcCef1bRgPmJVryznKWQRKR7tTpE4zdgcRddp+pf06kP4QMlPsXTycOxiv+BeX74oW+w3z+0A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8BxHOsEmWVl_1g9AA--.52128S3; Tue, 28 Nov 2023 15:38:44 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Dxvi8CmWVlXY9OAA--.42582S4; Tue, 28 Nov 2023 15:38:42 +0800 (CST) From: Li Wei To: gcc-patches@gcc.gnu.org Cc: xry111@xry111.site, i@xen0n.name, xuchenghua@loongson.cn, chenglulu@loongson.cn, Li Wei Subject: [PATCH v1 1/2] LoongArch: Accelerate optimization of scalar signed/unsigned popcount. Date: Tue, 28 Nov 2023 15:38:37 +0800 Message-Id: <20231128073837.2451935-1-liwei@loongson.cn> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Dxvi8CmWVlXY9OAA--.42582S4 X-CM-SenderInfo: 5olzvxo6or00hjvr0hdfq/ X-Coremail-Antispam: 1Uk129KBj93XoWxXrWfCrWkKr43uFyUAr4rXrc_yoWrXF1xpw srAry5tF48JFZ7G3Z3Ka43Jw4Yqr4xCF47Zay3t34Ikw12q3sFq3W8try2qFW7Ja15WryS qw4ru3Wj93W2qabCm3ZEXasCq-sJn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkYb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r106r15M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0cIa020Ex4CE44I27w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8czVUUUUUU== X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783792563757153888 X-GMAIL-MSGID: 1783792563757153888 In LoongArch, the vector popcount has corresponding instructions, while the scalar does not. Currently, the scalar popcount is calculated through a loop, and the value of a non-power of two needs to be iterated several times, so the vector popcount instruction is considered for optimization. gcc/ChangeLog: * config/loongarch/loongarch.md (v2di): Used to simplify the following templates. (popcount2): New. gcc/testsuite/ChangeLog: * gcc.target/loongarch/popcnt.c: New test. * gcc.target/loongarch/popcount.c: New test. --- gcc/config/loongarch/loongarch.md | 27 +++++++++++- gcc/testsuite/gcc.target/loongarch/popcnt.c | 41 +++++++++++++++++++ gcc/testsuite/gcc.target/loongarch/popcount.c | 17 ++++++++ 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/loongarch/popcnt.c create mode 100644 gcc/testsuite/gcc.target/loongarch/popcount.c diff --git a/gcc/config/loongarch/loongarch.md b/gcc/config/loongarch/loongarch.md index cd4ed495697..c440d9c348f 100644 --- a/gcc/config/loongarch/loongarch.md +++ b/gcc/config/loongarch/loongarch.md @@ -1515,7 +1515,30 @@ (define_insn "truncdfsf2" (set_attr "cnv_mode" "D2S") (set_attr "mode" "SF")]) - +;; In vector registers, popcount can be implemented directly through +;; the vector instruction [X]VPCNT. For GP registers, we can implement +;; it through the following method. Compared with loop implementation +;; of popcount, the following method has better performance. + +;; This attribute used for get connection of scalar mode and corresponding +;; vector mode. +(define_mode_attr cntmap [(SI "v4si") (DI "v2di")]) + +(define_expand "popcount2" + [(set (match_operand:GPR 0 "register_operand") + (popcount:GPR (match_operand:GPR 1 "register_operand")))] + "ISA_HAS_LSX" +{ + rtx in = operands[1]; + rtx out = operands[0]; + rtx vreg = mode == SImode ? gen_reg_rtx (V4SImode) : + gen_reg_rtx (V2DImode); + emit_insn (gen_lsx_vinsgr2vr_ (vreg, in, vreg, GEN_INT (1))); + emit_insn (gen_popcount2 (vreg, vreg)); + emit_insn (gen_lsx_vpickve2gr_ (out, vreg, GEN_INT (0))); + DONE; +}) + ;; ;; .................... ;; @@ -3882,7 +3905,7 @@ (define_peephole2 (any_extend:SI (match_dup 3)))])] "") - + (define_mode_iterator QHSD [QI HI SI DI]) diff --git a/gcc/testsuite/gcc.target/loongarch/popcnt.c b/gcc/testsuite/gcc.target/loongarch/popcnt.c new file mode 100644 index 00000000000..a10fca42092 --- /dev/null +++ b/gcc/testsuite/gcc.target/loongarch/popcnt.c @@ -0,0 +1,41 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mlsx" } */ +/* { dg-final { scan-assembler-not {popcount} } } */ +/* { dg-final { scan-assembler-times "vpcnt.d" 2 { target { loongarch64*-*-* } } } } */ +/* { dg-final { scan-assembler-times "vpcnt.w" 4 { target { loongarch64*-*-* } } } } */ + +int +foo (int x) +{ + return __builtin_popcount (x); +} + +long +foo1 (long x) +{ + return __builtin_popcountl (x); +} + +long long +foo2 (long long x) +{ + return __builtin_popcountll (x); +} + +int +foo3 (int *p) +{ + return __builtin_popcount (*p); +} + +unsigned +foo4 (int x) +{ + return __builtin_popcount (x); +} + +unsigned long +foo5 (int x) +{ + return __builtin_popcount (x); +} diff --git a/gcc/testsuite/gcc.target/loongarch/popcount.c b/gcc/testsuite/gcc.target/loongarch/popcount.c new file mode 100644 index 00000000000..390ff067617 --- /dev/null +++ b/gcc/testsuite/gcc.target/loongarch/popcount.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mlsx -fdump-tree-optimized" } */ +/* { dg-final { scan-tree-dump-times "__builtin_popcount|\\.POPCOUNT" 1 "optimized" } } */ + +int +PopCount (long b) +{ + int c = 0; + + while (b) + { + b &= b - 1; + c++; + } + + return c; +}