From patchwork Fri Nov 24 05:04:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "juzhe.zhong@rivai.ai" X-Patchwork-Id: 169171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp905995vqx; Thu, 23 Nov 2023 21:04:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcrjKsJq/Ulr+rDgIEtvWzW5c4WzQC8pTicdpNPs0rw50Cn1RBKijMsMxI4oCHqc+RzDSK X-Received: by 2002:a05:622a:1f0c:b0:423:9887:cd7f with SMTP id ca12-20020a05622a1f0c00b004239887cd7fmr1234267qtb.47.1700802298694; Thu, 23 Nov 2023 21:04:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700802298; cv=pass; d=google.com; s=arc-20160816; b=HX1x5V6kJRwe4LEq0kFhl34xdvwenT5KVuQXLcvkE4UiPQIowO3QwZvKXQx0yqwGt6 rqhjxIt42SmhNIwbdJBQ6hK4WNRH+G7LAmEhsc+KMqMgC1f0ffpFZZEw3864lqrP9x9T S4qla7WR1DLZDjkihQqeLEippcMXm7rnNMnzgN5lCx2lME6XvWGuyqSlojdteG1Wo83h KRVrSah/qcVfTotoc6CqYnHfbrlifrZD1HDUWyVeTrHcGeny7S6EUxdFF5qjI/C0tX47 RuJZMRjjCmzxM9sMqmEAOB+7koVA3kbmaoHxceXpH48s2+fcgGeCpN3+LQwyNPeQ8w2J f6ng== 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:feedback-id :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:arc-filter:dmarc-filter:delivered-to; bh=5s2Mrqt/f8jtNz5I4WPc6GQwYyXc4L/cy7Ym8rcPBkQ=; fh=idvV5TQ1gmHAoU8u1GUGfjilVySOK+BR5TeZLoSouN8=; b=F3lWKmcJMMYQoFkodI3EGeYj1p2d5kqqDWjeDfSB1PiFwHq0eD7IBL0CtWYgZB6dpp yRVbB7Z0QC3zzzif45WwohkC99eJcntRZe/7aZqn6F8Yg5D5Oj5OA1jf6uDrsTCSuE5r Dx7LmDpr6CgV2TwuXOkrmfHq5vf6wBp988rJdHvBLI+N7EiHC1tI/pbNPzV/vxx85zCo iiiGai/AyHF6j6mOL2sj2yxARxVGuzZ0wepylnbuSl6T2HKphsWskDxe8HICJv4YKz00 jvq/2zYRylbxlmYlNJlCdNSarRBxFlWeuwsBaMj7b8z4diZQ4jkMFcJGSIMAEz3t4TWk GTeg== 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 o10-20020a05622a044a00b00421bf5ed633si2588448qtx.529.2023.11.23.21.04.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 21:04:58 -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 771D23858C52 for ; Fri, 24 Nov 2023 05:04:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by sourceware.org (Postfix) with ESMTPS id EAE2D3858D1E for ; Fri, 24 Nov 2023 05:04:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EAE2D3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EAE2D3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=54.207.22.56 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700802274; cv=none; b=dj7oQ7DhhKu3R5rFgvftCIWc4ukr4ugf+fKBUMjIKby4cgH9sqOOQ/FxmmkN2RiXAA8uRgRwuKbj/SJehvpCnIhu7pwLLMfgYj+CPxm5R+hlDyUdNuwVOxyh0XuQEBKAChhuXbxL92pARAvdRoGy6SjjzO85BXLiymLbaDA1FA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700802274; c=relaxed/simple; bh=5sP8pbSJsLSQzQ7M+HuuRs3NDfebqluhwCX+4g3BkI4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=xyw+f8qymwOuITGmh8Y6wZuG3OugPBDX1GTTJrUm1Bx7iSvcCUnB0sPe1qfWoIFDpR3ZX2uZGNOed/ReOq8d43Zt7fie6Qz+sqbMBSh3dlZlfloduWI5HjE4L1TPROcsZ1C2Tzcws2v/3XD8/X9N4swLcFovoMhrm1W2J73O1B8= ARC-Authentication-Results: i=1; server2.sourceware.org X-QQ-mid: bizesmtp90t1700802260tmrlf70q Received: from rios-cad122.hadoop.rioslab.org ( [58.60.1.26]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 24 Nov 2023 13:04:19 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: Y5/s5IBMBZIA9RPQoUks+6sYzBaOM0oG3N1ndFQOd2iivu7t8nb8V6jWMjfip 5Vj2AIWv2RuOOypBIvODKapm2UCbRjXfPHcUUD2Sv20YaZIp7V7Q/hwNAyLoqAc/G1rmgh+ 7b8yGRvU7rPNhbB6rqcxwe6kd873zuLxXfXfj6DAewOr6gWDbrJO5OLapnRuzwVxhGApDI9 wtJsq3kjWJ5P0oCpPqg1ERTmOwN35VRAPxnfP9EAtczPfHsSNVylZPXZNHj4EpzwttRSotv Bm6eoAQOd6O6gerCPH0hm+VTZLZ85Si5K+dtLHfI7MWD0spVe7lD7pM99J9WYsrT2e3HZ/Y YnWMCT/k3ME9xQerB/Bdim2LQx80osfl15AHnJ6+JOQPD0Kc60HOVXcKzqfyUVSkhu0f65T roNKJSIUUZI= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 5902129080147990068 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Cc: Juzhe-Zhong Subject: [Committed] RISC-V: Disable BSWAP optimization for NUNITS < 4 Date: Fri, 24 Nov 2023 13:04:18 +0800 Message-Id: <20231124050418.1547599-1-juzhe.zhong@rivai.ai> X-Mailer: git-send-email 2.36.3 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz7a-one-0 X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SBL_CSS, SPF_HELO_PASS, 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: 1783420470830490660 X-GMAIL-MSGID: 1783420470830490660 When fixing bugs, I notice there is a piece odd codes look incorrect. which probably make codegen worse. #include typedef int8_t vnx2qi __attribute__ ((vector_size (2))); #define MASK_2(X, Y) (Y) - 1 - (X), (Y) - 2 - (X) #define PERMUTE(TYPE, NUNITS) \ __attribute__ ((noipa)) void permute_##TYPE (TYPE values1, TYPE values2, \ TYPE *out) \ { \ TYPE v \ = __builtin_shufflevector (values1, values2, MASK_##NUNITS (0, NUNITS)); \ *(TYPE *) out = v; \ } #define TEST_ALL(T) \ T (vnx2qi, 2) TEST_ALL (PERMUTE) Before this patch: vsetivli zero,2,e8,mf8,ta,ma vle8.v v1,0(a0) vsetivli zero,1,e16,mf4,ta,ma vsrl.vi v2,v1,8 vsll.vi v1,v1,8 vor.vv v1,v2,v1 vsetivli zero,2,e8,mf8,ta,ma vse8.v v1,0(a2) ret After this patch: vsetivli zero,2,e8,mf8,ta,ma vle8.v v3,0(a0) vid.v v1 vrsub.vi v1,v1,1 vrgather.vv v2,v3,v1 vse8.v v2,0(a2) ret Committed as it is very obvious if during code review. gcc/ChangeLog: * config/riscv/riscv-v.cc (shuffle_bswap_pattern): Disable for NUNIT < 4. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/autovec/vls-vlmax/perm-4.c: Adapt test. * gcc.target/riscv/rvv/autovec/vls/perm-4.c: Ditto. --- gcc/config/riscv/riscv-v.cc | 5 +++++ .../gcc.target/riscv/rvv/autovec/vls-vlmax/perm-4.c | 4 ++-- gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/perm-4.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc index 18619a11592..4bd1131ba87 100644 --- a/gcc/config/riscv/riscv-v.cc +++ b/gcc/config/riscv/riscv-v.cc @@ -3201,6 +3201,11 @@ shuffle_bswap_pattern (struct expand_vec_perm_d *d) if (!d->perm.series_p (i, step, diff - i, step)) return false; + /* Disable when nunits < 4 since the later generic approach + is more profitable on BSWAP. */ + if (!known_gt (GET_MODE_NUNITS (d->vmode), 2)) + return false; + if (d->testing_p) return true; diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm-4.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm-4.c index b235ec727b1..7ab31043547 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm-4.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls-vlmax/perm-4.c @@ -55,7 +55,7 @@ TEST_ALL (PERMUTE) -/* { dg-final { scan-assembler-times {vrgather\.vv\tv[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 18 } } */ +/* { dg-final { scan-assembler-times {vrgather\.vv\tv[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 19 } } */ /* { dg-final { scan-assembler-times {vrgatherei16\.vv\tv[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 12 } } */ -/* { dg-final { scan-assembler-times {vrsub\.vi} 23 } } */ +/* { dg-final { scan-assembler-times {vrsub\.vi} 24 } } */ /* { dg-final { scan-assembler-times {vrsub\.vx} 7 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/perm-4.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/perm-4.c index d2d49388a39..4d6862cf1c0 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/perm-4.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vls/perm-4.c @@ -3,7 +3,7 @@ #include "../vls-vlmax/perm-4.c" -/* { dg-final { scan-assembler-times {vrgather\.vv\tv[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 18 } } */ +/* { dg-final { scan-assembler-times {vrgather\.vv\tv[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 19 } } */ /* { dg-final { scan-assembler-times {vrgatherei16\.vv\tv[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 12 } } */ -/* { dg-final { scan-assembler-times {vrsub\.vi} 23 } } */ +/* { dg-final { scan-assembler-times {vrsub\.vi} 24 } } */ /* { dg-final { scan-assembler-times {vrsub\.vx} 7 } } */