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 6840A385843F; Wed, 26 Oct 2022 02:56:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6840A385843F 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 29Q2bLQj026642; Wed, 26 Oct 2022 02:56:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : references : date : in-reply-to : message-id : mime-version : content-type; s=pp1; bh=4X6Vt4wEDgbiTuSWaXZlF8O0wPOvLCPNPFNHUKAqpvc=; b=R1Dc0U4uB2nvJ+Ev6kGV0ni8PE0KeEOnm8cFS4XGM9IFP+4dMF9mH3FSo4MWPKDOArwx nVc0l43BcS9dSESN/BEkukTfXy4yW+gR+jbshfd/dj9C9buFVOkYl9Oq9Di24Pvd6kT0 XrLR85kq2j9ZSRecwE38Y1E45dby3WcwdcV7r0k7rjNa7w/StVVw16VnIR7L9hkLzxTT GWEzArDi1LOEQN/mZwEwwJWRxxguoHYsktMhOWqiMngoVglAsNbf6bOLaErWbJyg65ZC /nyrmF/WVulmdIjJ7IRybQATHRKVMszVR3ZKacVYCSD9K72/0m0wvruwR2tPKxzsu3Ee xw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kee99kh01-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Oct 2022 02:56:33 +0000 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 29Q2djlU002247; Wed, 26 Oct 2022 02:56:32 GMT Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3kee99kgyq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Oct 2022 02:56:32 +0000 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 29Q2nhtD006635; Wed, 26 Oct 2022 02:56:31 GMT Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by ppma04dal.us.ibm.com with ESMTP id 3kc85a7r02-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Oct 2022 02:56:31 +0000 Received: from smtpav03.wdc07v.mail.ibm.com ([9.208.128.112]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 29Q2uTCg5767712 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Oct 2022 02:56:30 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C17D258064; Wed, 26 Oct 2022 02:56:29 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 581A55805A; Wed, 26 Oct 2022 02:56:29 +0000 (GMT) Received: from pike (unknown [9.5.12.127]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTPS; Wed, 26 Oct 2022 02:56:29 +0000 (GMT) From: Jiufu Guo To: "Kewen.Lin" Cc: dje.gcc@gmail.com, segher@kernel.crashing.org, linkw@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [PATCH] rs6000: using li/lis+oris/xoris to build constants References: <20220824081344.70468-1-guojiufu@linux.ibm.com> Date: Wed, 26 Oct 2022 10:56:25 +0800 In-Reply-To: (Kewen Lin's message of "Thu, 20 Oct 2022 17:29:37 +0800") Message-ID: <7e8rl3xpgm.fsf@pike.rch.stglabs.ibm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-GCONF: 00 X-Proofpoint-GUID: kGofky_ynvLIA3tIwS6KyRnA-jQ-oBBA X-Proofpoint-ORIG-GUID: 6AXYpOdwAzKKkh7zysiuPoo_AtS4r3QQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-25_15,2022-10-25_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 suspectscore=0 mlxlogscore=921 spamscore=0 adultscore=0 mlxscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 clxscore=1011 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210260010 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_MSPIKE_H2,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: "Kewen.Lin" writes: > Hi Jeff, > > Sorry for late review, some comments are inline. > > on 2022/8/24 16:13, Jiufu Guo via Gcc-patches wrote: >> Hi, >> >> PR106708 constaint some constants which can be support by li/lis + oris/xoris. >> >> For constant C: >> if ((c & 0xFFFFFFFF80008000ULL) == 0x80000000ULL) or say: >> 32(0)+1(1)+15(x)+1(0)+15(x), we could use li+oris to build constant 'C'. >> >> if ((c & 0xFFFFFFFF00008000ULL) == 0xFFFFFFFF00008000ULL) or say: >> 32(1)+16(x)+1(1)+15(x), using li+xoris would be ok. >> >> if ((c & 0xFFFFFFFF0000FFFFULL) == 0xFFFFFFFF00000000) or say: >> 32(1)+1(0)+15(x)+16(0), using lis+xoris would be ok. >> > > Maybe it's good to add some explanation on the proposed writing "N(M)" > N continuous bit M, (x for M means either 1 or 0), and not sure if it's > good to use "||" for concatenation just like what ISA uses, the con > is it can be mis-interpreted as logical "or". > > Or maybe just expand all the low 32 bits and use "1..." or "0..." for the > high 32 bits. > Great, thanks for sugguestions! >> This patch update rs6000_emit_set_long_const to support these forms. >> Bootstrap and regtest pass on ppc64 and ppc64le. >> >> Is this ok for trunk? >> >> BR, >> Jeff(Jiufu) >> >> >> PR target/106708 >> >> gcc/ChangeLog: >> >> * config/rs6000/rs6000.cc (rs6000_emit_set_long_const): Using li/lis + >> oris/xoris to build constants. > > Nit: Support constants which can be built with li + oris or li/lis + > xoris? Thanks. > >> >> gcc/testsuite/ChangeLog: >> >> * gcc.target/powerpc/pr106708.c: New test. >> * gcc.target/powerpc/pr106708.h: New file. >> * gcc.target/powerpc/pr106708_1.c: New test. >> >> --- >> gcc/config/rs6000/rs6000.cc | 22 +++++++++++++++++++ >> gcc/testsuite/gcc.target/powerpc/pr106708.c | 10 +++++++++ >> gcc/testsuite/gcc.target/powerpc/pr106708.h | 9 ++++++++ >> gcc/testsuite/gcc.target/powerpc/pr106708_1.c | 17 ++++++++++++++ >> 4 files changed, 58 insertions(+) >> create mode 100644 gcc/testsuite/gcc.target/powerpc/pr106708.c >> create mode 100644 gcc/testsuite/gcc.target/powerpc/pr106708.h >> create mode 100644 gcc/testsuite/gcc.target/powerpc/pr106708_1.c >> >> diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc >> index df491bee2ea..243247fb838 100644 >> --- a/gcc/config/rs6000/rs6000.cc >> +++ b/gcc/config/rs6000/rs6000.cc >> @@ -10112,6 +10112,7 @@ rs6000_emit_set_long_const (rtx dest, HOST_WIDE_INT c) >> { >> rtx temp; >> HOST_WIDE_INT ud1, ud2, ud3, ud4; >> + HOST_WIDE_INT orig_c = c; >> >> ud1 = c & 0xffff; >> c = c >> 16; >> @@ -10137,6 +10138,27 @@ rs6000_emit_set_long_const (rtx dest, HOST_WIDE_INT c) >> gen_rtx_IOR (DImode, copy_rtx (temp), >> GEN_INT (ud1))); >> } >> + else if (ud4 == 0 && ud3 == 0 && (ud2 & 0x8000) && !(ud1 & 0x8000)) >> + { >> + temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode); >> + >> + /* li+oris */ >> + emit_move_insn (copy_rtx (temp), GEN_INT (ud1)); > > Nit: in previous discussion on some other patch, copy_rtx is not > necessary? Yeap, thanks! > >> + emit_move_insn (dest, gen_rtx_IOR (DImode, copy_rtx (temp), >> + GEN_INT (ud2 << 16))); >> + } > > I think this hunk above can be moved to the existing "(ud3 == 0 && ud4 == 0)" > handling branch (as the diff context below), and ud2 & 0x8000 is already > asserted there, it also saves check. Great, thanks for point out this. You are right, this would save some checking. > >> + else if ((ud4 == 0xffff && ud3 == 0xffff) >> + && ((ud1 & 0x8000) || (ud1 == 0 && !(ud2 & 0x8000)))) >> + { >> + temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode); >> + >> + HOST_WIDE_INT imm = (ud1 & 0x8000) ? ((ud1 ^ 0x8000) - 0x8000) >> + : ((ud2 << 16) - 0x80000000); >> + /* li/lis + xoris */ >> + emit_move_insn (copy_rtx (temp), GEN_INT (imm)); >> + emit_move_insn (dest, gen_rtx_XOR (DImode, copy_rtx (temp), >> + GEN_INT (orig_c ^ imm))); >> + } > > Same comment for copy_rtx. > >> else if (ud3 == 0 && ud4 == 0) >> { >> temp = !can_create_pseudo_p () ? dest : gen_reg_rtx (DImode); >> diff --git a/gcc/testsuite/gcc.target/powerpc/pr106708.c b/gcc/testsuite/gcc.target/powerpc/pr106708.c >> new file mode 100644 >> index 00000000000..6445fa47747 >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/pr106708.c >> @@ -0,0 +1,10 @@ >> +/* PR target/106708 */ >> +/* { dg-options "-O2 -mdejagnu-cpu=power8" } */ >> +/* { dg-do compile { target has_arch_ppc64 } } */ >> + > > Put dg-do as the first line, if you want has_arch_ppc64 to be behind dg-options, > separate it into a dg-require-effective-target. OK, thanks! > >> +#include "pr106708.h" >> + >> +/* { dg-final { scan-assembler-times {\mli\M} 2 } } */ >> +/* { dg-final { scan-assembler-times {\mlis\M} 1 } } */ >> +/* { dg-final { scan-assembler-times {\moris\M} 1 } } */ >> +/* { dg-final { scan-assembler-times {\mxoris\M} 2 } } */ >> diff --git a/gcc/testsuite/gcc.target/powerpc/pr106708.h b/gcc/testsuite/gcc.target/powerpc/pr106708.h >> new file mode 100644 >> index 00000000000..ad07eb30547 >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/pr106708.h >> @@ -0,0 +1,9 @@ >> +/* li/lis + oris/xoris */ > > > Nit: /* Test constants which can be built from li + oris and li/lis + xoris. */ > OK, thanks. >> +void __attribute__ ((__noinline__, __noclone__)) foo (long long *arg) >> +{ >> + *arg++ = 0x98765432ULL; >> + *arg++ = 0xffffffff7cdeab55ULL; >> + *arg++ = 0xffffffff65430000ULL; >> +} >> + >> + >> diff --git a/gcc/testsuite/gcc.target/powerpc/pr106708_1.c b/gcc/testsuite/gcc.target/powerpc/pr106708_1.c >> new file mode 100644 >> index 00000000000..df65c321f6b >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/pr106708_1.c > > Nit: better with name pr106708-run.c? Ok, thanks! > > BR, > Kewen > >> @@ -0,0 +1,17 @@ >> +/* PR target/106708 */ >> +/* { dg-do run } */ >> +/* { dg-options "-O2" } */ >> + >> +#include "pr106708.h" >> + >> +long long arr[] = {0x98765432ULL, 0xffffffff7cdeab55ULL, 0xffffffff65430000ULL}; >> +int >> +main () >> +{ >> + long long a[3]; >> + >> + foo (a); >> + if (__builtin_memcmp (a, arr, sizeof (arr)) != 0) >> + __builtin_abort (); >> + return 0; >> +}