From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by sourceware.org (Postfix) with ESMTPS id D581D3858D38 for ; Thu, 9 Nov 2023 02:43:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D581D3858D38 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sifive.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D581D3858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::233 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699497816; cv=none; b=o4qLgRNRhD9giq5aInjiPjnAR2BzNO918UUbztlBvqu0LlEIwUYaICh73W6nmbWOq0nFb/QKi/40x4QPperPa70QmEVil0zKearYMgV06awfupDl8zYHEeiQlRZOIIrsPdx39YmX1fUiq5IPIMQq9xM+0pB1neP/iRM6b7ZfMKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699497816; c=relaxed/simple; bh=MSIQqWHYmY0Jpc/Q1QhojdW2g+PaiBq5me21mbaHabc=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=pg/OWH70sAsUp46j9fBGLNP3ng+8rdikAGYShtJuMSo4qwunrx5U3f+oRh8dxDYMSNp9pULTbUBZKUbDXSwr8ijsIFfTzZ+E/mFljhXmvkh4IW6Of08GFxZJgsJR3+hiHyGdMrQX+WnEmbVt29rFl3qxgXPN9/X12bMnu4q8abI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c6b30acacdso3990581fa.2 for ; Wed, 08 Nov 2023 18:43:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1699497812; x=1700102612; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=rdCCg3pqo5CHEHj1vg8okXM5+kWwTIfgEXui8U6NPQE=; b=TCVr8lGlgv+5iYp/PTE4tSsU6xxo5/vaDtiPS+XIKsAaHpZ+3s7s8Hfj9WI1CtHrkT IyaK2LBhxHTohHw0X+yw8NVEPoSYh7QueDH6bA4VjqQ7yUg/sZdLIxF1Ldr/XhB1M4e5 l7VGScEe8xHTLT6tpB2cQVMDcz/4HQDZTzgyNMbZCTIKIscJoWThomctaDcuqHeRR04G zsg7sND5J91GXJGZzLXnT1Jwl0KCpovl10oAwQ2uv0LBTQwQKr30DSVhe9qaYDB5jlOk Cm5EJR6tVJbDD29QoFkugMFf6GikiHD5u7HuLNvy1dDWqeXBh5PSEPEiHzCM1UbVYMfG EhiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699497812; x=1700102612; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rdCCg3pqo5CHEHj1vg8okXM5+kWwTIfgEXui8U6NPQE=; b=QR3wgppiM+9lFE3HgJnmo3HSQqKxsu+6dwQPNz6DHbj3g7UenDDgiPN8tocnymZIPl ZqVM9bYbTBEiHJjKmLCY5l/4pqZcPcVjEZoUkivg99I189a+/8zWKEjwJELVa1rOGKhF 2OvHaKrKuF0iHPgQdra+fYB/DpshkKwT0il0zmyde3yV8tcgAezpol0LFRMFHn2EC0jb 4zX6eiUn42JYhD3kBMaki5+xwS5fX5yK7J7A3fAJsD3DglEk22yeHU+8ClJ1h4LUYs76 kfH4zaHDR+d/xwYwjHjQ4LBZ81qehcT9u0FbclO379JUYHtW3kUnigq+MLfoiE2xfIet LHOA== X-Gm-Message-State: AOJu0YwKdvDheC5f/4NLBoHaaNWuizknbJQD/8LIpskCMm1wFZxI4CvH wIhpHrD8C1u9F+soh9WkWAjDS/wJfXR4Qb2wdR6gJw== X-Google-Smtp-Source: AGHT+IFHhSWouy6oCXq4thp9Ros5YRABeR/33Cl42iFzmaZA8hUaXMGOuY+6c+wb3ylGi5OrQ6kCoc/KkdR9cULhQ30= X-Received: by 2002:a2e:2e0d:0:b0:2c5:14eb:1080 with SMTP id u13-20020a2e2e0d000000b002c514eb1080mr2981144lju.21.1699497812128; Wed, 08 Nov 2023 18:43:32 -0800 (PST) MIME-Version: 1.0 References: <20231109023917.3985192-1-juzhe.zhong@rivai.ai> In-Reply-To: <20231109023917.3985192-1-juzhe.zhong@rivai.ai> From: Kito Cheng Date: Thu, 9 Nov 2023 10:43:21 +0800 Message-ID: Subject: Re: [PATCH] RISC-V: Fix dynamic LMUL cost model ICE To: Juzhe-Zhong Cc: gcc-patches@gcc.gnu.org, kito.cheng@gmail.com, jeffreyalaw@gmail.com, rdapp.gcc@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: LGTM, thanks :) On Thu, Nov 9, 2023 at 10:39=E2=80=AFAM Juzhe-Zhong = wrote: > > When trying to use dynamic LMUL to compile benchmark. > Notice there is a bunch ICEs. > > This patch fixes those ICEs and append tests. > > gcc/ChangeLog: > > * config/riscv/riscv-vector-costs.cc (costs::preferred_new_lmul_p= ): Fix ICE. > > gcc/testsuite/ChangeLog: > > * gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-1.c: New test. > * gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-2.c: New test. > * gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-3.c: New test. > > --- > gcc/config/riscv/riscv-vector-costs.cc | 11 +++++--- > .../costmodel/riscv/rvv/dynamic-lmul-ice-1.c | 25 +++++++++++++++++++ > .../costmodel/riscv/rvv/dynamic-lmul-ice-2.c | 22 ++++++++++++++++ > .../costmodel/riscv/rvv/dynamic-lmul-ice-3.c | 14 +++++++++++ > 4 files changed, 69 insertions(+), 3 deletions(-) > create mode 100644 gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic= -lmul-ice-1.c > create mode 100644 gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic= -lmul-ice-2.c > create mode 100644 gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic= -lmul-ice-3.c > > diff --git a/gcc/config/riscv/riscv-vector-costs.cc b/gcc/config/riscv/ri= scv-vector-costs.cc > index af87388a1e4..8036c9c40d7 100644 > --- a/gcc/config/riscv/riscv-vector-costs.cc > +++ b/gcc/config/riscv/riscv-vector-costs.cc > @@ -231,7 +231,9 @@ compute_local_live_ranges ( > > TODO: We may elide the cases that the unnecessary IM= M in > the future. */ > - if (is_gimple_val (var) && !POINTER_TYPE_P (TREE_TYPE (= var))) > + if (poly_int_tree_p (var) > + || (is_gimple_val (var) > + && !POINTER_TYPE_P (TREE_TYPE (var)))) > { > biggest_mode > =3D get_biggest_mode (biggest_mode, > @@ -416,7 +418,8 @@ static void > update_local_live_ranges ( > vec_info *vinfo, > hash_map> &program_points_per_bb, > - hash_map> &live_ranges_per_bb) > + hash_map> &live_ranges_per_bb, > + machine_mode *biggest_mode) > { > loop_vec_info loop_vinfo =3D dyn_cast (vinfo); > if (!loop_vinfo) > @@ -501,6 +504,8 @@ update_local_live_ranges ( > : get_store_value (gsi_stmt (si)); > tree sel_type =3D build_nonstandard_integer_type ( > TYPE_PRECISION (TREE_TYPE (var)), 1); > + *biggest_mode > + =3D get_biggest_mode (*biggest_mode, TYPE_MODE (sel_type)= ); > tree sel =3D build_decl (UNKNOWN_LOCATION, VAR_DECL, > get_identifier ("vect_perm"), sel_ty= pe); > pair &live_range =3D live_ranges->get_or_insert (sel, &exis= ted_p); > @@ -572,7 +577,7 @@ costs::preferred_new_lmul_p (const vector_costs *unca= st_other) const > > /* Update live ranges according to PHI. */ > update_local_live_ranges (other->m_vinfo, program_points_per_bb, > - live_ranges_per_bb); > + live_ranges_per_bb, &biggest_mode); > > /* TODO: We calculate the maximum live vars base on current STMTS > sequence. We can support live range shrink if it can give us > diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-i= ce-1.c b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-1.c > new file mode 100644 > index 00000000000..4f019ccae6b > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-1.c > @@ -0,0 +1,25 @@ > +/* { dg-do compile } */ > +/* { dg-options "-march=3Drv32gcv -mabi=3Dilp32 -O3 -ftree-vectorize --p= aram riscv-autovec-lmul=3Ddynamic" } */ > + > +int a, *b[9], c, d, e; > + > +static int > +fn1 () > +{ > + for (c =3D 6; c >=3D 0; c--) > + for (d =3D 0; d < 2; d++) > + { > + b[d * 2 + c] =3D 0; > + e =3D a > 1 ? : 0; > + if (e =3D=3D 2) > + return 0; > + } > + return 0; > +} > + > +int > +main () > +{ > + fn1 (); > + return 0; > +} > diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-i= ce-2.c b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-2.c > new file mode 100644 > index 00000000000..6fc8062f23b > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-2.c > @@ -0,0 +1,22 @@ > +/* { dg-do compile } */ > +/* { dg-options "-march=3Drv32gcv -mabi=3Dilp32 -Ofast -ftree-vectorize = --param riscv-autovec-lmul=3Ddynamic" } */ > + > +typedef struct rtx_def *rtx; > +struct replacement { > + rtx *where; > + rtx *subreg_loc; > + int mode; > +}; > +static struct replacement replacements[150]; > +void move_replacements (rtx *x, rtx *y, int n_replacements) > +{ > + int i; > + for (i =3D 0; i < n_replacements; i++) > + if (replacements[i].subreg_loc =3D=3D x) > + replacements[i].subreg_loc =3D y; > + else if (replacements[i].where =3D=3D x) > + { > + replacements[i].where =3D y; > + replacements[i].subreg_loc =3D 0; > + } > +} > diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-i= ce-3.c b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-3.c > new file mode 100644 > index 00000000000..c1f698b9a68 > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/vect/costmodel/riscv/rvv/dynamic-lmul-ice-3.c > @@ -0,0 +1,14 @@ > +/* { dg-do compile } */ > +/* { dg-options "-march=3Drv32gcv -mabi=3Dilp32 -O2 -ftree-vectorize -fl= to -fno-use-linker-plugin -flto-partition=3Dnone --param riscv-autovec-lmul= =3Ddynamic" } */ > + > +void (*foo[6][6]) (int); > +void bar (hdR) > + int hdR; > +{ } > +void xxx () > +{ > + unsigned int i, j; > + for (i =3D 0; i < 6; ++i) > + for (j =3D 0; j < 6; ++j) > + foo [i][j] =3D bar; > +} > -- > 2.36.3 >