From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from fd01.gateway.ufhost.com (fd01.gateway.ufhost.com [61.152.239.71]) by sourceware.org (Postfix) with ESMTPS id 73F573857437 for ; Wed, 20 Dec 2023 08:15:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 73F573857437 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=starfivetech.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 73F573857437 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=61.152.239.71 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703060131; cv=none; b=dfpaNSEAanIFVBYHqflFkvHtnX+f85Tn0Oel5PcwUOghrSbQzdaQiAA0QuofC/0LvQP0IahJIDbRBXBbeq6N207PFstV5GXcMFE2EgDMyJcZVgKdKy84jGCo+/xd+TGIHsAajyXB+r/HdK0p/U2vCroVUtUE/5ZEy0SGRVdujIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703060131; c=relaxed/simple; bh=o0u9mvqyzG3J0lRsy8ycKe+1DGBzYgc9Q0D8o2D+Voc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=m3F0QDni2M7eFJGyu7NvYoDt5babIP+QmSvVJqdxS8JwDGORZWY1doxaN5S1eE9KSHQSwVC3AxAk57jMQjTph9AJ2QbISjRY4G9Tki0KMRssUUVf4O59/uF9CGVZI9oanF2wO8xVdOVnqMCPlR7/Y80UVsvMcLsqJ3/+7RvW9Lo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by fd01.gateway.ufhost.com (Postfix) with ESMTP id EFC96807D; Wed, 20 Dec 2023 16:15:22 +0800 (CST) Received: from EXMBX168.cuchost.com (172.16.6.78) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 20 Dec 2023 16:15:23 +0800 Received: from damon-pc.localdomain (113.72.145.47) by EXMBX168.cuchost.com (172.16.6.78) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 20 Dec 2023 16:15:22 +0800 From: demin.han To: CC: , Subject: [PATCH] RISC-V: Fix calculation of max live vregs Date: Wed, 20 Dec 2023 16:15:37 +0800 Message-ID: <20231220081537.2013818-1-demin.han@starfivetech.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [113.72.145.47] X-ClientProxiedBy: EXCAS064.cuchost.com (172.16.6.24) To EXMBX168.cuchost.com (172.16.6.78) X-YovoleRuleAgent: yovoleflag Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,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 List-Id: For the stmt _1 =3D _2 + _3, assume that _2 or _3 not used after this stm= t. _1 can use same register with _2 or _3 if without early clobber. Two registers are needed, but current calculation is three. This patch preserves point 0 for bb entry and excludes its def when calculates live regs of certain point. Signed-off-by: demin.han gcc/ChangeLog: * config/riscv/riscv-vector-costs.cc (max_number_of_live_regs): Fix=20 max live vregs calc (preferred_new_lmul_p): Ditto gcc/testsuite/ChangeLog: * gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul2-7.c: Moved to... * gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-10.c: ...here. * gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-4.c: Moved to... * gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul8-11.c: ...here. --- gcc/config/riscv/riscv-vector-costs.cc | 10 +++++----- .../rvv/{dynamic-lmul2-7.c =3D> dynamic-lmul4-10.c} | 6 +++--- .../rvv/{dynamic-lmul4-4.c =3D> dynamic-lmul8-11.c} | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/{dynamic-lmul2-7.c = =3D> dynamic-lmul4-10.c} (79%) rename gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/{dynamic-lmul4-4.c = =3D> dynamic-lmul8-11.c} (87%) diff --git a/gcc/config/riscv/riscv-vector-costs.cc b/gcc/config/riscv/ri= scv-vector-costs.cc index e7bc9ed5233..a316603e207 100644 --- a/gcc/config/riscv/riscv-vector-costs.cc +++ b/gcc/config/riscv/riscv-vector-costs.cc @@ -123,7 +123,7 @@ compute_local_program_points ( /* Collect the stmts that is vectorized and mark their program poi= nt. */ for (i =3D 0; i < nbbs; i++) { - int point =3D 0; + int point =3D 1; basic_block bb =3D bbs[i]; vec program_points =3D vNULL; if (dump_enabled_p ()) @@ -300,13 +300,13 @@ max_number_of_live_regs (const basic_block bb, unsigned int i; unsigned int live_point =3D 0; auto_vec live_vars_vec; - live_vars_vec.safe_grow_cleared (max_point + 1, true); + live_vars_vec.safe_grow_cleared (max_point, true); for (hash_map::iterator iter =3D live_ranges.begin (); iter !=3D live_ranges.end (); ++iter) { tree var =3D (*iter).first; pair live_range =3D (*iter).second; - for (i =3D live_range.first; i <=3D live_range.second; i++) + for (i =3D live_range.first + 1; i <=3D live_range.second; i++) { machine_mode mode =3D TYPE_MODE (TREE_TYPE (var)); unsigned int nregs @@ -485,7 +485,7 @@ update_local_live_ranges ( if (!program_points_per_bb.get (e->src)) continue; unsigned int max_point - =3D (*program_points_per_bb.get (e->src)).length () - 1; + =3D (*program_points_per_bb.get (e->src)).length (); live_range =3D live_ranges->get (def); if (!live_range) continue; @@ -571,7 +571,7 @@ preferred_new_lmul_p (loop_vec_info other_loop_vinfo) { basic_block bb =3D (*iter).first; unsigned int max_point - =3D (*program_points_per_bb.get (bb)).length () - 1; + =3D (*program_points_per_bb.get (bb)).length () + 1; if ((*iter).second.is_empty ()) continue; /* We prefer larger LMUL unless it causes register spillings. */ diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul2-= 7.c b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-10.c similarity index 79% rename from gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul2-7= .c rename to gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-10.= c index 636332dbb62..74e629168f8 100644 --- a/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul2-7.c +++ b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-10.c @@ -17,10 +17,10 @@ bar (int *x, int a, int b, int n) return sum1 + sum2; } =20 -/* { dg-final { scan-assembler {e32,m2} } } */ +/* { dg-final { scan-assembler {e32,m4} } } */ /* { dg-final { scan-assembler-not {jr} } } */ /* { dg-final { scan-assembler-times {ret} 2 } } * /* { dg-final { scan-tree-dump-times "Maximum lmul =3D 8" 1 "vect" } } *= / -/* { dg-final { scan-tree-dump-times "Maximum lmul =3D 4" 1 "vect" } } *= / -/* { dg-final { scan-tree-dump "Maximum lmul =3D 2" "vect" } } */ +/* { dg-final { scan-tree-dump "Maximum lmul =3D 4" "vect" } } */ +/* { dg-final { scan-tree-dump-not "Maximum lmul =3D 2" "vect" } } */ /* { dg-final { scan-tree-dump-not "Maximum lmul =3D 1" "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-= 4.c b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul8-11.c similarity index 87% rename from gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-4= .c rename to gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul8-11.= c index 01a359bc7c8..01c976dd67b 100644 --- a/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul4-4.c +++ b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul8-11.c @@ -39,9 +39,9 @@ void foo2 (int64_t *__restrict a, } } =20 -/* { dg-final { scan-assembler {e64,m4} } } */ +/* { dg-final { scan-assembler {e64,m8} } } */ /* { dg-final { scan-assembler-not {csrr} } } */ -/* { dg-final { scan-tree-dump-times "Maximum lmul =3D 8" 1 "vect" } } *= / -/* { dg-final { scan-tree-dump "Maximum lmul =3D 4" "vect" } } */ +/* { dg-final { scan-tree-dump "Maximum lmul =3D 8" "vect" } } */ +/* { dg-final { scan-tree-dump-not "Maximum lmul =3D 4" "vect" } } */ /* { dg-final { scan-tree-dump-not "Maximum lmul =3D 2" "vect" } } */ /* { dg-final { scan-tree-dump-not "Maximum lmul =3D 1" "vect" } } */ --=20 2.43.0