From patchwork Thu Jan 25 00:45:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Andrew Pinski (QUIC)" X-Patchwork-Id: 191802 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1340569dyi; Wed, 24 Jan 2024 16:46:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUd8KFJBjVhGNlM9wNcETOifMaqsRrI+l/ayCcZoSRZHF1lyW5H9+Lk7YG6geOSfnWTJwu X-Received: by 2002:a05:620a:898:b0:783:2b15:c5df with SMTP id b24-20020a05620a089800b007832b15c5dfmr294566qka.111.1706143593877; Wed, 24 Jan 2024 16:46:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706143593; cv=pass; d=google.com; s=arc-20160816; b=SRNVlH5+LMcCu5jylbXUzzGValFwT/5qAz0KJqWdR9sr6ASrDZbx2agmmyuCLpcR4V Qej1QC/M6vKcJU8DIdN0SHce+bI/IZnrVXh1C7LRtFXfKxxg2RksDKsPUeGmFTpdPGxp v1njc4n2uMWRE7oUCYumjybzvr7hHc7z1iZ8c/dhlOWBcChQu7V0ZKX8N7kL6rOswq4z 4mWxg1EkA/UX/2qayx1K1IsyoNzYukGSpr+Yyiy297XydkBDkCHrKLj3GKRbCPOqqydm j712b8Mz8zhu7G07B+HJBTnoPu5dLpeK22GQzmTAgnuQICs8HhoxcxgJhQ7Udm3vCrKT 6crA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=Mx0XtXwsVF+nq+oFGu49jJ4Hz7C3u4wVruk0tV1++nk=; fh=o3CEdS3yGN/eIa89Zn0Kf01WYLxTE9IjKuSQGVPeOHI=; b=rtmBI7+Vp3kQ1zM7Ub1H6F/ExPF1cYmqNa5u5ssHZFw1g9DMwVgzy+InVCmUneMDdW YgWeSip/a5Zh2xl57R6I0uvWgwcCbuIRRuTyGwCNI0pdd8ubGztXlTM38PAKE3NgK7AY LfCPd06ALsae3qREhq+NVrcSPPrQ8kKCErvOH/x9/Y4j3biHnTVfG9t3oiDmbfaHcRr+ VOShAdtIa5yCJoX0wCzrrAtg8sim0H6PcR42AJJ9ug/YVz6Mi9p94eIpvmQVKXSWLMI6 UPldygQQFL6NiK8E5fuFQLt042GVlfGJUEnuITCf+HL2JSOt1zzIda7FTbwKhBsZSfef hLlA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=FHziDg31; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id i1-20020a05620a0a0100b007835218c6f3si11061354qka.230.2024.01.24.16.46.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 16:46:33 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=FHziDg31; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7B56E3858C2F for ; Thu, 25 Jan 2024 00:46:33 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by sourceware.org (Postfix) with ESMTPS id BEA783858D28 for ; Thu, 25 Jan 2024 00:45:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BEA783858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=quicinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BEA783858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706143546; cv=none; b=PAk+xfKEXd6wHN4UOWY1+hJ72wLoGM1EKaD3WGp4gC2XMiOXcgOmMngr4iRHpRO4CqWl/OaNXaatg977kzdWDbqtl9jzmnxjC+NKz/2kZyLBkQSk2YKnoEvh3Zpe2rLF1EPjUsUoNP5Gw6d5rR7g5yi5kjdSWVpa5cZUVpy4Hs4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706143546; c=relaxed/simple; bh=/FMbz0C+oezWC9FIEGdyKIeIznQ3DVSf/2gz7yuwnVI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KkIcZzEMrwO3F2W2k6/QTQWZ9LSPxAaVsYSS975TzCCgr8xXjGa5tozC5rIep3QYkavkgE2XSeOOCmqdP7mJt2ehH8CgeLGeA3GWxkEs5tu0cT6ZzK8GQVljQ965rFGqPzodSAf/DHtyyvWqlaAtwBW1kPfMd8pyA8GrmKGKW9E= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40ONcMEO026141 for ; Thu, 25 Jan 2024 00:45:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=qcppdkim1; bh=Mx0XtXw sVF+nq+oFGu49jJ4Hz7C3u4wVruk0tV1++nk=; b=FHziDg31Ifd2wNti6QZuEfi ZV7zBvW/lF/dH7zSkkuoi0OKTKWHbGu/k5AB9UK1tgb0S7REhnERVRvVx6Jty85n IU8fTcwZeyo5tKQ0DTJglskhexAADdKFc2XKZ6xwgw62YBRYrkOrbnygHA4668ap WYiMtOqnHhzhIe/MD5G5KLns7TkGn3Jwg2VFihj+/X7Y55Y1O9OkUBDYAh4oCVXv f8a6yjkRgvu4lmXOWRAT5qhG5yFDR2Jswk5y3//7hIN5KQPDRWimoaxnx7OMe8pr wKg/HFbg39BQ/1EU4nYFcYXJxDZpfEN6ZBnhWYQ45Hm2uus7jiNRrsg+pV1PZ5Q= = Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vu1cchr7y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jan 2024 00:45:43 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40P0jgCx021334 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jan 2024 00:45:42 GMT Received: from hu-apinski-lv.qualcomm.com (10.49.16.6) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 24 Jan 2024 16:45:41 -0800 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] Fix a few vect gimple testcases for LLP64 targets (e.g. mingw) [PR113548] Date: Wed, 24 Jan 2024 16:45:31 -0800 Message-ID: <20240125004531.4178253-1-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: TBDi2nfXHVHTTswBDT-hEIgihWaOD_79 X-Proofpoint-GUID: TBDi2nfXHVHTTswBDT-hEIgihWaOD_79 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-01-24_12,2024-01-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=815 clxscore=1015 malwarescore=0 adultscore=0 suspectscore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401250002 X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789021224747066770 X-GMAIL-MSGID: 1789021224747066770 This fixes of the vect testcases which uses the gimple FE for LLP64 targets. The testcases use directly `unsigned long` for the addition to pointers when they should be using `__SIZETYPE__`. This changes to use that instead. gcc/testsuite/ChangeLog: PR testsuite/113548 * gcc.dg/vect/slp-reduc-10a.c: Use `__SIZETYPE__` instead of `unsigned long`. * gcc.dg/vect/slp-reduc-10b.c: Likewise. * gcc.dg/vect/slp-reduc-10c.c: Likewise. * gcc.dg/vect/slp-reduc-10d.c: Likewise. * gcc.dg/vect/slp-reduc-10e.c: Likewise. * gcc.dg/vect/vect-cond-arith-2.c: Likewise. * gcc.dg/vect/vect-ifcvt-19.c: Likewise. Signed-off-by: Andrew Pinski --- gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c | 20 +++++++++---------- gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c | 20 +++++++++---------- gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c | 6 +++--- gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c | 6 +++--- gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c | 6 +++--- gcc/testsuite/gcc.dg/vect/vect-cond-arith-2.c | 8 ++++---- gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c | 8 ++++---- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c index d3c2c2d7f54..66d3a6c4765 100644 --- a/gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c +++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c @@ -8,8 +8,8 @@ foo (int * x, int n) int i; int sum; int _1; - long unsigned int _2; - long unsigned int _3; + __SIZETYPE__ _2; + __SIZETYPE__ _3; int * _4; int _5; __SIZETYPE__ _7; @@ -38,23 +38,23 @@ foo (int * x, int n) sum_30 = __PHI (__BB5: 0, __BB6: sum_27); i_32 = __PHI (__BB5: 0, __BB6: i_28); _1 = i_32 * 4; - _2 = (long unsigned int) _1; - _3 = _2 * 4ul; + _2 = (__SIZETYPE__) _1; + _3 = _2 * _Literal(__SIZETYPE__)4; _4 = x_23(D) + _3; _5 = __MEM (_4); sum_24 = _5 + sum_30; - _7 = _2 + 1ul; - _8 = _7 * 4ul; + _7 = _2 + _Literal(__SIZETYPE__)1; + _8 = _7 * _Literal(__SIZETYPE__)4; _9 = x_23(D) + _8; _10 = __MEM (_9); sum_25 = _10 + sum_24; - _11 = _2 + 2ul; - _12 = _11 * 4ul; + _11 = _2 + _Literal(__SIZETYPE__)2; + _12 = _11 * _Literal(__SIZETYPE__)4; _13 = x_23(D) + _12; _14 = __MEM (_13); sum_26 = _14 + sum_25; - _15 = _2 + 3ul; - _16 = _15 * 4ul; + _15 = _2 + _Literal(__SIZETYPE__)3; + _16 = _15 * _Literal(__SIZETYPE__)4; _17 = x_23(D) + _16; _18 = __MEM (_17); sum_27 = _18 + sum_26; diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c index 6a0d55def30..2e6d15e1c9d 100644 --- a/gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c +++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c @@ -8,8 +8,8 @@ foo (int * x, int n) int i; int sum; int _1; - long unsigned int _2; - long unsigned int _3; + __SIZETYPE__ _2; + __SIZETYPE__ _3; int * _4; int _5; __SIZETYPE__ _7; @@ -38,23 +38,23 @@ foo (int * x, int n) sum_30 = __PHI (__BB5: 0, __BB6: sum_27); i_32 = __PHI (__BB5: 0, __BB6: i_28); _1 = i_32 * 4; - _2 = (long unsigned int) _1; - _3 = _2 * 4ul; + _2 = (__SIZETYPE__) _1; + _3 = _2 * _Literal(__SIZETYPE__)4; _4 = x_23(D) + _3; _5 = __MEM (_4); sum_24 = _5 + sum_30; - _7 = _2 + 1ul; - _8 = _7 * 4ul; + _7 = _2 + _Literal(__SIZETYPE__)1; + _8 = _7 * _Literal(__SIZETYPE__)4; _9 = x_23(D) + _8; _100 = __MEM (_9); sum_25 = sum_24 + _100; - _11 = _2 + 2ul; - _12 = _11 * 4ul; + _11 = _2 + _Literal(__SIZETYPE__)2; + _12 = _11 * _Literal(__SIZETYPE__)4; _13 = x_23(D) + _12; _14 = __MEM (_13); sum_26 = _14 + sum_25; - _15 = _2 + 3ul; - _16 = _15 * 4ul; + _15 = _2 + _Literal(__SIZETYPE__)3; + _16 = _15 * _Literal(__SIZETYPE__)4; _17 = x_23(D) + _16; _18 = __MEM (_17); sum_27 = _18 + sum_26; diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c index 20df2626764..25a21adb729 100644 --- a/gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c +++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c @@ -8,8 +8,8 @@ foo (int * x, int n) int i; int sum; int _1; - long unsigned int _2; - long unsigned int _3; + __SIZETYPE__ _2; + __SIZETYPE__ _3; int * _4; int _5; __SIZETYPE__ _7; @@ -38,7 +38,7 @@ foo (int * x, int n) sum_30 = __PHI (__BB5: 0, __BB6: sum_27); i_32 = __PHI (__BB5: 0, __BB6: i_28); _1 = i_32 * 4; - _2 = (long unsigned int) _1; + _2 = (__SIZETYPE__) _1; _3 = _2 * 4ul; _4 = x_23(D) + _3; _5 = __MEM (_4); diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c index 8a512d5c14d..e96f9c42dcc 100644 --- a/gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c +++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c @@ -8,8 +8,8 @@ foo (int * x, int n) int i; int sum; int _1; - long unsigned int _2; - long unsigned int _3; + __SIZETYPE__ _2; + __SIZETYPE__ _3; int * _4; int _5; __SIZETYPE__ _7; @@ -38,7 +38,7 @@ foo (int * x, int n) sum_30 = __PHI (__BB5: 0, __BB6: sum_27); i_32 = __PHI (__BB5: 0, __BB6: i_28); _1 = i_32 * 4; - _2 = (long unsigned int) _1; + _2 = (__SIZETYPE__) _1; _3 = _2 * 4ul; _4 = x_23(D) + _3; _5 = __MEM (_4); diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c index 268ec9db77d..3a2c583d671 100644 --- a/gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c +++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c @@ -8,8 +8,8 @@ foo (int * x, int n) int i; int sum; int _1; - long unsigned int _2; - long unsigned int _3; + __SIZETYPE__ _2; + __SIZETYPE__ _3; int * _4; int _100; __SIZETYPE__ _7; @@ -38,7 +38,7 @@ foo (int * x, int n) sum_30 = __PHI (__BB5: 0, __BB6: sum_27); i_32 = __PHI (__BB5: 0, __BB6: i_28); _1 = i_32 * 4; - _2 = (long unsigned int) _1; + _2 = (__SIZETYPE__) _1; _3 = _2 * 4ul; _4 = x_23(D) + _3; _100 = __MEM (_4); diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-arith-2.c b/gcc/testsuite/gcc.dg/vect/vect-cond-arith-2.c index 7b3d73acb88..a4fb043004c 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-cond-arith-2.c +++ b/gcc/testsuite/gcc.dg/vect/vect-cond-arith-2.c @@ -6,8 +6,8 @@ double __GIMPLE (ssa, startwith("loop")) neg_xi (double *x) { int i; - long unsigned int index; - long unsigned int offset; + __SIZETYPE__ index; + __SIZETYPE__ offset; double * xi_ptr; double xi; double neg_xi; @@ -21,8 +21,8 @@ neg_xi (double *x) res_1 = __PHI (__BB5: 0.0, __BB3: res_2); i_4 = __PHI (__BB5: 0, __BB3: i_5); ivtmp_6 = __PHI (__BB5: 100U, __BB3: ivtmp_7); - index = (long unsigned int) i_4; - offset = index * 8UL; + index = (__SIZE_TYPE__) i_4; + offset = index * _Literal(__SIZE_TYPE__) 8; xi_ptr = x_8(D) + offset; xi = *xi_ptr; neg_xi = -xi; diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c index e34bfa907a7..b10147298d3 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c +++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c @@ -7,8 +7,8 @@ foo (int * f, int d, int e) int t; int a; int i; - long unsigned int _1; - long unsigned int _2; + __SIZETYPE__ _1; + __SIZETYPE__ _2; int * _3; int _4; @@ -17,8 +17,8 @@ foo (int * f, int d, int e) __BB(3,loop_header(1),guessed_local(1063004408)): i_18 = __PHI (__BB8: i_15, __BB2: 0); - _1 = (long unsigned int) i_18; - _2 = _1 * 4ul; + _1 = (__SIZETYPE__) i_18; + _2 = _1 * _Literal(__SIZETYPE__) 4; _3 = f_9(D) + _2; a_10 = __MEM (_3); if (a_10 < 0)