From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 7C8443858288 for ; Tue, 9 Apr 2024 02:07:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7C8443858288 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7C8443858288 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712628465; cv=none; b=PrfwCk1iJvQQhR0LotVbgfoPQ3HUWg1pU2KIOrqebw8giNub/CX1muKytDvMFeQbhEDyCMaWTfHGPAON9vQkKgfW52R7yb4f0vSEIHtzZXyrqHGSaUpOrlXbEmJwZdEwfg+UR92s+u+14Nfio+NjTur9hNA8ddYbIHXUAF9Nuvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712628465; c=relaxed/simple; bh=89vp6+obS5CBQkdO2obVzxgXw5HvNCTpKycZGay3qcQ=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=j8KfJ7sSZZfbcnimvQgSbCSZrD+GDSogbXn1bhcGTX4Tu70kJNBJAa7UbqUbVzeYSNpd/a3vG2jId8R21cTySGxm8w6e50qgSOcdyVU2SUMti7fkOQ1cd4HFjblGL//NgNlp+/OV/ZwI9cNiAV2kgfjh0jNeN9Vkp0nnA7tVj+o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353728.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 4391lPrY010904; Tue, 9 Apr 2024 02:07:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=5oI+Lp9HOsN0o2b3bGh0dRmXbHkz/LhkenY9nAqIJew=; b=TmdTZS1adHMHhBB/C7LVr0J1lKaOV8QngRfDN5vXIuGG4wiEBsI02udyT84y/sXCxkOX Zuzhrls7I2Dn+UUVB2o9PRcqf+tbJjEoBbIR6PnOeVXF5c4Lwc7jzOw4byusdYKL6Q3o QD+MaU6nrCWjzNAmWvRM+YBM8hPbqZaF0deXheuJNsq3lZ03lltAuHDqFE9qvAf97pW5 Dwt/zdfcIfQET0r0KljHnXRHGaQYZyhmsddQhjR+/qEpQBUbOVVNF3KEJcl7+jKpDYJ+ 1pkPo84ptIIRxrsAug2aaz6KKSU+ewiWFU9rJ3w09QxFOGbwKgZKr+CQA7ytrcQcN/YU ZQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3xcuner2ke-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Apr 2024 02:07:42 +0000 Received: from m0353728.ppops.net (m0353728.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 43927f64011583; Tue, 9 Apr 2024 02:07:41 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3xcuner2k9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Apr 2024 02:07:41 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 4391TT5s022573; Tue, 9 Apr 2024 02:07:40 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3xbhqnuj15-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Apr 2024 02:07:40 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 43927aL949348966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Apr 2024 02:07:38 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 36BA120043; Tue, 9 Apr 2024 02:07:36 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EC41320040; Tue, 9 Apr 2024 02:07:33 +0000 (GMT) Received: from [9.200.61.88] (unknown [9.200.61.88]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 9 Apr 2024 02:07:33 +0000 (GMT) Message-ID: <2c7f198d-6e07-fbdf-0f41-17504bc61017@linux.ibm.com> Date: Tue, 9 Apr 2024 10:07:32 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH] rs6000: Fix wrong align passed to build_aligned_type [PR88309] Content-Language: en-US To: Richard Biener Cc: GCC Patches , Segher Boessenkool , David Edelsohn , Peter Bergner , Andrew Pinski References: <8bc0fa05-e254-6c85-f48b-e7d353eb9a18@linux.ibm.com> From: "Kewen.Lin" In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: aHTkinuv8Q6E1Tkzex_-Fc9QupxMnzm0 X-Proofpoint-GUID: nCTq-rOIdT-BagevOClR_30nHr-kz_ek X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-08_19,2024-04-05_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404090010 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP 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: on 2024/4/8 18:47, Richard Biener wrote: > On Mon, Apr 8, 2024 at 11:22 AM Kewen.Lin wrote: >> >> Hi, >> >> As the comments in PR88309 show, there are two oversights >> in rs6000_gimple_fold_builtin that pass align in bytes to >> build_aligned_type but which actually requires align in >> bits, it causes unexpected ICE or hanging in function >> is_miss_rate_acceptable due to zero align_unit value. >> >> This patch is to fix them by converting bytes to bits, add >> an assertion on positive align_unit value and notes function >> build_aligned_type requires align measured in bits in its >> function comment. >> >> Bootstrapped and regtested on x86_64-redhat-linux, >> powerpc64-linux-gnu P8/P9 and powerpc64le-linux-gnu P9 and P10. >> >> Is it (the generic part code change) ok for trunk? > > OK Thanks, pushed as r14-9850, is it also ok to backport after burn-in time? BR, Kewen > >> BR, >> Kewen >> ----- >> PR target/88309 >> >> Co-authored-by: Andrew Pinski >> >> gcc/ChangeLog: >> >> * config/rs6000/rs6000-builtin.cc (rs6000_gimple_fold_builtin): Fix >> wrong align passed to function build_aligned_type. >> * tree-ssa-loop-prefetch.cc (is_miss_rate_acceptable): Add an >> assertion to ensure align_unit should be positive. >> * tree.cc (build_qualified_type): Update function comments. >> >> gcc/testsuite/ChangeLog: >> >> * gcc.target/powerpc/pr88309.c: New test. >> --- >> gcc/config/rs6000/rs6000-builtin.cc | 4 ++-- >> gcc/testsuite/gcc.target/powerpc/pr88309.c | 27 ++++++++++++++++++++++ >> gcc/tree-ssa-loop-prefetch.cc | 2 ++ >> gcc/tree.cc | 3 ++- >> 4 files changed, 33 insertions(+), 3 deletions(-) >> create mode 100644 gcc/testsuite/gcc.target/powerpc/pr88309.c >> >> diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc >> index 6698274031b..e7d6204074c 100644 >> --- a/gcc/config/rs6000/rs6000-builtin.cc >> +++ b/gcc/config/rs6000/rs6000-builtin.cc >> @@ -1900,7 +1900,7 @@ rs6000_gimple_fold_builtin (gimple_stmt_iterator *gsi) >> tree lhs_type = TREE_TYPE (lhs); >> /* In GIMPLE the type of the MEM_REF specifies the alignment. The >> required alignment (power) is 4 bytes regardless of data type. */ >> - tree align_ltype = build_aligned_type (lhs_type, 4); >> + tree align_ltype = build_aligned_type (lhs_type, 32); >> /* POINTER_PLUS_EXPR wants the offset to be of type 'sizetype'. Create >> the tree using the value from arg0. The resulting type will match >> the type of arg1. */ >> @@ -1944,7 +1944,7 @@ rs6000_gimple_fold_builtin (gimple_stmt_iterator *gsi) >> tree arg2_type = ptr_type_node; >> /* In GIMPLE the type of the MEM_REF specifies the alignment. The >> required alignment (power) is 4 bytes regardless of data type. */ >> - tree align_stype = build_aligned_type (arg0_type, 4); >> + tree align_stype = build_aligned_type (arg0_type, 32); >> /* POINTER_PLUS_EXPR wants the offset to be of type 'sizetype'. Create >> the tree using the value from arg1. */ >> gimple_seq stmts = NULL; >> diff --git a/gcc/testsuite/gcc.target/powerpc/pr88309.c b/gcc/testsuite/gcc.target/powerpc/pr88309.c >> new file mode 100644 >> index 00000000000..c0078cf2b8c >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/pr88309.c >> @@ -0,0 +1,27 @@ >> +/* { dg-require-effective-target powerpc_vsx_ok } */ >> +/* { dg-options "-mvsx -O2 -fprefetch-loop-arrays" } */ >> + >> +/* Verify there is no ICE or hanging. */ >> + >> +#include >> + >> +void b(float *c, vector float a, vector float, vector float) >> +{ >> + vector float d; >> + vector char ahbc; >> + vec_xst(vec_perm(a, d, ahbc), 0, c); >> +} >> + >> +vector float e(vector unsigned); >> + >> +void f() { >> + float *dst; >> + int g = 0; >> + for (;; g += 16) { >> + vector unsigned m, i; >> + vector unsigned n, j; >> + vector unsigned k, l; >> + b(dst + g * 3, e(m), e(n), e(k)); >> + b(dst + (g + 4) * 3, e(i), e(j), e(l)); >> + } >> +} >> diff --git a/gcc/tree-ssa-loop-prefetch.cc b/gcc/tree-ssa-loop-prefetch.cc >> index bbd98e03254..70073cc4fe4 100644 >> --- a/gcc/tree-ssa-loop-prefetch.cc >> +++ b/gcc/tree-ssa-loop-prefetch.cc >> @@ -739,6 +739,8 @@ is_miss_rate_acceptable (unsigned HOST_WIDE_INT cache_line_size, >> if (delta >= (HOST_WIDE_INT) cache_line_size) >> return false; >> >> + gcc_assert (align_unit > 0); >> + >> miss_positions = 0; >> total_positions = (cache_line_size / align_unit) * distinct_iters; >> max_allowed_miss_positions = (ACCEPTABLE_MISS_RATE * total_positions) / 1000; >> diff --git a/gcc/tree.cc b/gcc/tree.cc >> index f801712c9dd..6f8400e6640 100644 >> --- a/gcc/tree.cc >> +++ b/gcc/tree.cc >> @@ -5689,7 +5689,8 @@ build_qualified_type (tree type, int type_quals MEM_STAT_DECL) >> return t; >> } >> >> -/* Create a variant of type T with alignment ALIGN. */ >> +/* Create a variant of type T with alignment ALIGN which >> + is measured in bits. */ >> >> tree >> build_aligned_type (tree type, unsigned int align) >> -- >> 2.43.0