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 7F5A23858C52; Wed, 31 Aug 2022 09:22:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7F5A23858C52 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 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27V8QAMi012098; Wed, 31 Aug 2022 09:22:27 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=he0lCIFyP6m0dRJ13NjKFzcVEpjNw1UiuxF99QF2AlI=; b=ouWkX4wCoMEJdLS2mLLz0Pzjf9ZaSUTqox3o+JTY/AX5y/rj1TTIYvJKaXmb4lLDC8Y2 FZ03VR2Cpco+TTRU//AjiPmPAIzQac+VoMStmfUFzub7QDQFbgI1nASeoTzj0WeU2nhx PtzlPFWT94pyuoe8nQww1SJDIFqia6Ks/HkDInmvj935O89Tb5OZ4RRvDalbF77JTgtL KuqCx7sINvnZXELr0J7i7xSoDUh8vwRSOUoGSl/dh05hJ8kdCOLe/13yEdF8tACbRMqT 5De5UhPzlkAytEnW7H7O4T8lycSbEkh5NuNEhg1V1y2ttz5xVmRsXhvNqXbESZITDT53 Bg== Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ja44q9t1s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 31 Aug 2022 09:22:26 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 27V9LlPd015406; Wed, 31 Aug 2022 09:22:24 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma04fra.de.ibm.com with ESMTP id 3j7aw9bp8q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 31 Aug 2022 09:22:24 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 27V9MLIt33882544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 31 Aug 2022 09:22:21 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3C689A404D; Wed, 31 Aug 2022 09:22:21 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E8D74A4053; Wed, 31 Aug 2022 09:22:19 +0000 (GMT) Received: from [9.197.247.44] (unknown [9.197.247.44]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 31 Aug 2022 09:22:19 +0000 (GMT) Message-ID: Date: Wed, 31 Aug 2022 17:22:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH] rs6000: Don't ICE when we disassemble an MMA variable [PR101322] Content-Language: en-US To: Peter Bergner Cc: GCC Patches , Segher Boessenkool References: From: "Kewen.Lin" In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: oNsmjnWjf9CtOKE49O7r-JOkGuK8hOu8 X-Proofpoint-ORIG-GUID: oNsmjnWjf9CtOKE49O7r-JOkGuK8hOu8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-31_05,2022-08-31_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 malwarescore=0 impostorscore=0 priorityscore=1501 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208310045 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_MSPIKE_H2,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: Hi Peter, Thanks for the patch! Some comments are inline as below. on 2022/8/27 11:50, Peter Bergner via Gcc-patches wrote: > When we expand an MMA disassemble built-in with C++ using a pointer that > is casted to a valid MMA type, the type isn't passed down to the expand > machinery and we end up using the base type of the pointer which leads to > an ICE. This patch enforces we always use the correct MMA type regardless > of the pointer type being used. > > This passed bootstrap and regtesting on powerpc64le-linux with no regressions. > Ok for trunk and backports after some burn-in time? > > Peter > > gcc/ > PR target/101322 > * config/rs6000/rs6000-builtin.cc (rs6000_gimple_fold_mma_builtin): > Enforce the use of a valid MMA pointer type. > > gcc/testsuite/ > PR target/101322 > * g++.target/powerpc/pr101322.C: New test. > > diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc > index 12afa86854c..e796e74f072 100644 > --- a/gcc/config/rs6000/rs6000-builtin.cc > +++ b/gcc/config/rs6000/rs6000-builtin.cc > @@ -1085,7 +1085,12 @@ rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi, > unsigned nvec = (fncode == RS6000_BIF_DISASSEMBLE_ACC) ? 4 : 2; > tree dst_ptr = gimple_call_arg (stmt, 0); > tree src_ptr = gimple_call_arg (stmt, 1); > - tree src_type = TREE_TYPE (src_ptr); > + tree src_type = (fncode == RS6000_BIF_DISASSEMBLE_ACC) > + ? build_pointer_type (vector_quad_type_node) > + : build_pointer_type (vector_pair_type_node); Nit: it seems we can use existing ptr_vector_quad_type_node and ptr_vector_pair_type_node? I assume the const qualifier is fine since it's for disassembling. > + if (TREE_TYPE (TREE_TYPE (src_ptr)) != src_type) This line looks unexpected, the former is type char while the latter is type __vector_pair *. I guess you meant to compare the type of pointer type like: TREE_TYPE (TREE_TYPE (src_ptr)) != TREE_TYPE (src_type) or even with mode like: TYPE_MODE (TREE_TYPE (TREE_TYPE (src_ptr))) != TYPE_MODE (TREE_TYPE (src_type)) > + src_ptr = build1 (VIEW_CONVERT_EXPR, src_type, src_ptr); Nit: NOP_EXPR seems to be better suited here for pointer conversion. BR, Kewen > + > tree src = create_tmp_reg_or_ssa_name (TREE_TYPE (src_type)); > gimplify_assign (src, build_simple_mem_ref (src_ptr), &new_seq); > > diff --git a/gcc/testsuite/g++.target/powerpc/pr101322.C b/gcc/testsuite/g++.target/powerpc/pr101322.C > new file mode 100644 > index 00000000000..59e71e8eb89 > --- /dev/null > +++ b/gcc/testsuite/g++.target/powerpc/pr101322.C > @@ -0,0 +1,17 @@ > +/* PR target/101322 */ > +/* { dg-options "-O2 -mdejagnu-cpu=power10" } */ > +/* { dg-require-effective-target power10_ok } */ > + > +/* Verify we don't ICE on the following test cases. */ > + > +void > +foo (char *resp, char *vpp) > +{ > + __builtin_vsx_disassemble_pair (resp, (__vector_pair *) vpp); > +} > + > +void > +bar (char *resp, char *vpp) > +{ > + __builtin_mma_disassemble_acc (resp, (__vector_quad *)vpp); > +}