From patchwork Tue May 30 20:41:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Love X-Patchwork-Id: 101110 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2449297vqr; Tue, 30 May 2023 13:42:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4F8GBsg0DQRZw/+NAxzhl/3cmg78ww3SRlFsLkJa7lFNs4vzpZk8h71yxb6olsD0o+v1q0 X-Received: by 2002:a2e:7e12:0:b0:2b0:3046:9d1 with SMTP id z18-20020a2e7e12000000b002b0304609d1mr1492140ljc.34.1685479322426; Tue, 30 May 2023 13:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685479322; cv=none; d=google.com; s=arc-20160816; b=oRmOMVRZHk1FUlOt4i1KLAnaK3ipd5wxPVnnTfoDTbBZEdTQuDBaKg7UMR1/XhK4D1 V3wZwB2fd//9upz7LytjEUO9EcounCNs1LXo+XBI72Xf5RCMi1I+BNWmTVxGUEJoyJWI rvRzi77dzmrQXCOLKMBqhvnJK6n7sQ1737jsjx1BRgA8o7z6ZuJ/poZWtNeroxPatjCu OfqFD8Bf3M7lchgNxNX4vqv6QAChqEmiW/Ao2VcqnInHswJpiJcmz80x/xPVCnvTJjB9 K2e1FHr12T5LOayu/YYnHIgQfQJ53V1l8tcPjPmYZnAZ/W7LS1htF1rudPyR/9UmAIdQ yFOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:date:cc:to:subject :message-id:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=s/9ge502zN+QnB3UZwCk9E/hMfSClWOJJL9RxnGiUIQ=; b=N2AgwMhZRPnLTrWvYZVJ5O5iVOAPxOC/EUW6h93S5cL9e8QJWBksBOIOBKXh5dmw0Z WCgtZE4sNAE5oE33OU5AA25fbCVg4FB85eO8CD9jihikH+Bzd9uO0bG3hKsEhpZnDQUi ZDHTGj2Goea6aZSecZ2VcHZ5Flj/Xe60NmTdn9SHNE5MZefzqgVW5pTXgPH+ghb0rjdH vGJtmbOXNp8Swex0xClROgBSgg7hdxYaoEakdx1h0VWXUkL05LU0p6Wa5mD4Km0JiMWH Mv4Jy2EVGe144oltRCmilEt0cbpvTbzrD11QAPhw1eh3G64pwDxQS1kQqu0idjSZT935 V8NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ozLmQt3R; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ta21-20020a1709078c1500b00965f5320a7bsi6916640ejc.941.2023.05.30.13.42.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 13:42:02 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ozLmQt3R; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ED5B63857713 for ; Tue, 30 May 2023 20:42:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED5B63857713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685479321; bh=s/9ge502zN+QnB3UZwCk9E/hMfSClWOJJL9RxnGiUIQ=; h=Subject:To:Cc:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ozLmQt3R6TQWiIIbmAA+Z6MBBFBxf8zAZi2bMZaX44Zj089c1e0TvhmTLmhtLomk3 bIIe1IWOy1uswCgxT3tmwtrDApbzuOAehsBAsf3Pb7Fp3060O9Bv5Jhqcr7TQNtsMF waTPD4HgZNxnNww5GT/0qadYmBuCcF4XD7t7TbKA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 1852C3858D20 for ; Tue, 30 May 2023 20:41:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1852C3858D20 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34UKYAa5005201; Tue, 30 May 2023 20:41:14 GMT Received: from ppma05wdc.us.ibm.com (1b.90.2fa9.ip4.static.sl-reverse.com [169.47.144.27]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qwjej9t8q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 May 2023 20:41:13 +0000 Received: from pps.filterd (ppma05wdc.us.ibm.com [127.0.0.1]) by ppma05wdc.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 34UI52qF012653; Tue, 30 May 2023 20:41:12 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([9.208.130.98]) by ppma05wdc.us.ibm.com (PPS) with ESMTPS id 3qu9g5reyg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 May 2023 20:41:12 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 34UKfAXc3670776 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 May 2023 20:41:10 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8EAFA58056; Tue, 30 May 2023 20:41:10 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D6F5258054; Tue, 30 May 2023 20:41:09 +0000 (GMT) Received: from li-e362e14c-2378-11b2-a85c-87d605f3c641.ibm.com (unknown [9.163.31.184]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 30 May 2023 20:41:09 +0000 (GMT) Message-ID: <63afb57c80647d16859c4a2bdd83fa2bbcdc843e.camel@us.ibm.com> Subject: [PATCH] rs6000, fix vec_replace_unaligned builtin arguments To: "Kewen.Lin" , Segher Boessenkool , gcc-patches@gcc.gnu.org Cc: cel@us.ibm.com, Peter Bergner Date: Tue, 30 May 2023 13:41:09 -0700 X-Mailer: Evolution 3.28.5 (3.28.5-18.el8) Mime-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: FJqJVD6KP_jOhJ5j4FkzGoc2mnG1WP_d X-Proofpoint-GUID: FJqJVD6KP_jOhJ5j4FkzGoc2mnG1WP_d X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-05-30_16,2023-05-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 phishscore=0 impostorscore=0 mlxscore=0 priorityscore=1501 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305300167 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SCC_5_SHORT_WORD_LINES, SPF_HELO_NONE, SPF_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carl Love via Gcc-patches From: Carl Love Reply-To: Carl Love Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767353166036305200?= X-GMAIL-MSGID: =?utf-8?q?1767353166036305200?= GCC maintainers: The following patch fixes the first argument in the builtin definition and the corresponding test cases. Initially, the builtin specification was wrong due to a cut and past error. The documentation was fixed in: commit 8cb748a31cd8c7ac9c88b6abc38ce077dd462a7a Author: Bill Schmidt Date: Fri Feb 4 13:26:44 2022 -0600 rs6000: Clean up ISA 3.1 documentation [PR100808] Due to a pasto error in the documentation, vec_replace_unaligned was implemented with the same function prototypes as vec_replace_elt. It was intended that vec_replace_unaligned always specify output vectors as having type vector unsigned char, to emphasize that elements are potentially misaligned by this built-in function. This patch corrects the misimplementation. 2022-02-04 Bill Schmidt gcc/ PR target/100808 * doc/extend.texi (Basic PowerPC Built-in Functions Available on ISA 3.1): Provide consistent type names. Remove unnecessary semicolons. Fix bad line breaks. This patch fixes the arguments in the definitions and updates the testcases accordingly. Additionally, a few minor spacing issues are fixed. The patch has been tested on Power 10 with no regressions. Please let me know if the patch is acceptable for mainline. Thanks. Carl -------------------------------------------------- rs6000, fix vec_replace_unaligned builtin arguments The first argument of the vec_replace_unaligned builtin should always be unsinged char, as specified in gcc/doc/extend.texi. This patch fixes the buitin definitions and updates the testcases to use the correct arguments. gcc/ChangeLog: * config/rs6000/rs6000-overload.def (__builtin_vec_replace_un): Fix first argument type. gcc/testsuite/ChangeLog: * gcc.target/powerpc/ver-replace-word-runnable.c (vec_replace_unaligned) Fix first argument type. (vresult_uchar): Fix expected results. (vec_replace_unaligned): Update for loop to check uchar results. Remove extra spaces in if statements. Insert missing spaces in for statements. (dg-final): Update expected instruction counts. --- gcc/config/rs6000/rs6000-overload.def | 12 +- .../powerpc/vec-replace-word-runnable.c | 157 ++++++++++-------- 2 files changed, 92 insertions(+), 77 deletions(-) diff --git a/gcc/config/rs6000/rs6000-overload.def b/gcc/config/rs6000/rs6000-overload.def index c582490c084..26dc662b8fb 100644 --- a/gcc/config/rs6000/rs6000-overload.def +++ b/gcc/config/rs6000/rs6000-overload.def @@ -3059,17 +3059,17 @@ VREPLACE_ELT_V2DF [VEC_REPLACE_UN, vec_replace_unaligned, __builtin_vec_replace_un] - vuc __builtin_vec_replace_un (vui, unsigned int, const int); + vuc __builtin_vec_replace_un (vuc, unsigned int, const int); VREPLACE_UN_UV4SI - vuc __builtin_vec_replace_un (vsi, signed int, const int); + vuc __builtin_vec_replace_un (vuc, signed int, const int); VREPLACE_UN_V4SI - vuc __builtin_vec_replace_un (vull, unsigned long long, const int); + vuc __builtin_vec_replace_un (vuc, unsigned long long, const int); VREPLACE_UN_UV2DI - vuc __builtin_vec_replace_un (vsll, signed long long, const int); + vuc __builtin_vec_replace_un (vuc, signed long long, const int); VREPLACE_UN_V2DI - vuc __builtin_vec_replace_un (vf, float, const int); + vuc __builtin_vec_replace_un (vuc, float, const int); VREPLACE_UN_V4SF - vuc __builtin_vec_replace_un (vd, double, const int); + vuc __builtin_vec_replace_un (vuc, double, const int); VREPLACE_UN_V2DF [VEC_REVB, vec_revb, __builtin_vec_revb] diff --git a/gcc/testsuite/gcc.target/powerpc/vec-replace-word-runnable.c b/gcc/testsuite/gcc.target/powerpc/vec-replace-word-runnable.c index 27318822871..66b0ef58996 100644 --- a/gcc/testsuite/gcc.target/powerpc/vec-replace-word-runnable.c +++ b/gcc/testsuite/gcc.target/powerpc/vec-replace-word-runnable.c @@ -20,6 +20,9 @@ main (int argc, char *argv []) unsigned char ch; unsigned int index; + vector unsigned char src_va_uchar; + vector unsigned char expected_vresult_uchar; + vector unsigned int vresult_uint; vector unsigned int expected_vresult_uint; vector unsigned int src_va_uint; @@ -64,10 +67,10 @@ main (int argc, char *argv []) vresult_uint = vec_replace_elt (src_va_uint, src_a_uint, 2); - if (!vec_all_eq (vresult_uint, expected_vresult_uint)) { + if (!vec_all_eq (vresult_uint, expected_vresult_uint)) { #if DEBUG printf("ERROR, vec_replace_elt (src_vb_uint, src_va_uint, index)\n"); - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) printf(" vresult_uint[%d] = %d, expected_vresult_uint[%d] = %d\n", i, vresult_uint[i], i, expected_vresult_uint[i]); #else @@ -82,10 +85,10 @@ main (int argc, char *argv []) vresult_int = vec_replace_elt (src_va_int, src_a_int, 1); - if (!vec_all_eq (vresult_int, expected_vresult_int)) { + if (!vec_all_eq (vresult_int, expected_vresult_int)) { #if DEBUG printf("ERROR, vec_replace_elt (src_vb_int, src_va_int, index)\n"); - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) printf(" vresult_int[%d] = %d, expected_vresult_int[%d] = %d\n", i, vresult_int[i], i, expected_vresult_int[i]); #else @@ -100,10 +103,10 @@ main (int argc, char *argv []) vresult_float = vec_replace_elt (src_va_float, src_a_float, 1); - if (!vec_all_eq (vresult_float, expected_vresult_float)) { + if (!vec_all_eq (vresult_float, expected_vresult_float)) { #if DEBUG printf("ERROR, vec_replace_elt (src_vb_float, src_va_float, index)\n"); - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) printf(" vresult_float[%d] = %f, expected_vresult_float[%d] = %f\n", i, vresult_float[i], i, expected_vresult_float[i]); #else @@ -122,7 +125,7 @@ main (int argc, char *argv []) if (!vec_all_eq (vresult_ullint, expected_vresult_ullint)) { #if DEBUG printf("ERROR, vec_replace_elt (src_vb_ullint, src_va_ullint, index)\n"); - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) printf(" vresult_ullint[%d] = %d, expected_vresult_ullint[%d] = %d\n", i, vresult_ullint[i], i, expected_vresult_ullint[i]); #else @@ -137,10 +140,10 @@ main (int argc, char *argv []) vresult_llint = vec_replace_elt (src_va_llint, src_a_llint, 1); - if (!vec_all_eq (vresult_llint, expected_vresult_llint)) { + if (!vec_all_eq (vresult_llint, expected_vresult_llint)) { #if DEBUG printf("ERROR, vec_replace_elt (src_vb_llint, src_va_llint, index)\n"); - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) printf(" vresult_llint[%d] = %d, expected_vresult_llint[%d] = %d\n", i, vresult_llint[i], i, expected_vresult_llint[i]); #else @@ -155,10 +158,10 @@ main (int argc, char *argv []) vresult_double = vec_replace_elt (src_va_double, src_a_double, 1); - if (!vec_all_eq (vresult_double, expected_vresult_double)) { + if (!vec_all_eq (vresult_double, expected_vresult_double)) { #if DEBUG printf("ERROR, vec_replace_elt (src_vb_double, src_va_double, index)\n"); - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) printf(" vresult_double[%d] = %f, expected_vresult_double[%d] = %f\n", i, vresult_double[i], i, expected_vresult_double[i]); #else @@ -169,60 +172,68 @@ main (int argc, char *argv []) /* Vector replace 32-bit element, unaligned */ src_a_uint = 345; - src_va_uint = (vector unsigned int) { 1, 2, 0, 0 }; - vresult_uint = (vector unsigned int) { 0, 0, 0, 0 }; + src_va_uchar = (vector unsigned char) { 1, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; + vresult_uchar = (vector unsigned char) { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; /* Byte index 7 will overwrite part of elements 2 and 3 */ - expected_vresult_uint = (vector unsigned int) { 1, 2, 345*256, 0 }; + expected_vresult_uchar + = (vector unsigned char) { 1, 0, 0, 0, 2, 0, 0, 0, + 0, 0x59, 0x1, 0, 0, 0, 0, 0 }; - vresult_uchar = vec_replace_unaligned (src_va_uint, src_a_uint, 3); - vresult_uint = (vector unsigned int) vresult_uchar; + vresult_uchar = vec_replace_unaligned (src_va_uchar, src_a_uint, 3); - if (!vec_all_eq (vresult_uint, expected_vresult_uint)) { + if (!vec_all_eq (vresult_uchar, expected_vresult_uchar)) { #if DEBUG - printf("ERROR, vec_replace_unaligned (src_vb_uint, src_va_uint, index)\n"); - for(i = 0; i < 4; i++) - printf(" vresult_uint[%d] = %d, expected_vresult_uint[%d] = %d\n", - i, vresult_uint[i], i, expected_vresult_uint[i]); + printf("ERROR, vec_replace_unaligned (src_va_uchar, src_va_uint, index)\n"); + for (i = 0; i < 16; i++) + printf(" vresult_uchar[%d] = 0x%x, expected_vresult_uint[%d] = 0%x\n", + i, vresult_uchar[i], i, expected_vresult_uchar[i]); #else abort(); #endif } src_a_int = 234; - src_va_int = (vector int) { 1, 0, 3, 4 }; - vresult_int = (vector int) { 0, 0, 0, 0 }; + src_va_uchar = (vector unsigned char) { 1, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 4, 0, 0, 0 }; + vresult_uchar = (vector unsigned char) { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; /* Byte index 7 will over write part of elements 1 and 2 */ - expected_vresult_int = (vector int) { 1, 234*256, 0, 4 }; - - vresult_uchar = vec_replace_unaligned (src_va_int, src_a_int, 7); - vresult_int = (vector signed int) vresult_uchar; + expected_vresult_uchar = (vector unsigned char) { 1, 0, 0, 0, 0, 0xea, 0, 0, + 0, 0, 0, 0, 4, 0, 0, 0 }; - if (!vec_all_eq (vresult_int, expected_vresult_int)) { + vresult_uchar = vec_replace_unaligned (src_va_uchar, src_a_int, 7); + + if (!vec_all_eq (vresult_uchar, expected_vresult_uchar)) { #if DEBUG - printf("ERROR, vec_replace_unaligned (src_vb_int, src_va_int, index)\n"); - for(i = 0; i < 4; i++) - printf(" vresult_int[%d] = %d, expected_vresult_int[%d] = %d\n", - i, vresult_int[i], i, expected_vresult_int[i]); + printf("ERROR, vec_replace_unaligned (src_va_uchar, src_va_int, index)\n"); + for (i = 0; i < 16; i++) + printf(" vresult_int[%d] = 0x%x, expected_vresult_int[%d] = 0x%x\n", + i, vresult_uchar[i], i, expected_vresult_uchar[i]); #else abort(); #endif } src_a_float = 34.0; - src_va_float = (vector float) { 0.0, 10.0, 20.0, 30.0 }; - vresult_float = (vector float) { 0.0, 0.0, 0.0, 0.0 }; - expected_vresult_float = (vector float) { 0.0, 34.0, 20.0, 30.0 }; + src_va_uchar = (vector unsigned char) { 0, 0, 0, 0, 0, 0, 0x41, 0xa0, + 5, 6, 7, 8, 0x41, 0xf0, 0, 0}; + vresult_uchar = (vector unsigned char) { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; + expected_vresult_uchar + = (vector unsigned char) { 0, 0, 0, 0, 0, 0, 8, 0x42, + 5, 6, 7, 8, 0x41, 0xf0, 0, 0 }; - vresult_uchar = vec_replace_unaligned (src_va_float, src_a_float, 8); - vresult_float = (vector float) vresult_uchar; + vresult_uchar = vec_replace_unaligned (src_va_uchar, src_a_float, 8); - if (!vec_all_eq (vresult_float, expected_vresult_float)) { + if (!vec_all_eq (vresult_uchar, expected_vresult_uchar)) { #if DEBUG - printf("ERROR, vec_replace_unaligned (src_vb_float, src_va_float, " + printf("ERROR, vec_replace_unaligned (src_va_uchar, src_va_float, " "index)\n"); - for(i = 0; i < 4; i++) - printf(" vresult_float[%d] = %f, expected_vresult_float[%d] = %f\n", - i, vresult_float[i], i, expected_vresult_float[i]); + for (i = 0; i < 16; i++) + printf(" vresult_uchar[%d] = 0x%x, expected_vresult_uchar[%d] = 0x%x\n", + i, vresult_uchar[i], i, expected_vresult_uchar[i]); #else abort(); #endif @@ -230,61 +241,67 @@ main (int argc, char *argv []) /* Vector replace 64-bit element, unaligned */ src_a_ullint = 456; - src_va_ullint = (vector unsigned long long int) { 0, 0x222 }; - vresult_ullint = (vector unsigned long long int) { 0, 0 }; - expected_vresult_ullint = (vector unsigned long long int) { 456*256, - 0x200 }; + src_va_uchar = (vector unsigned char) { 0, 0xc, 0x1, 0, 0, 0, 0, 0, + 0x22, 0x2, 0, 0, 0, 0, 0, 0 }; + vresult_uchar = (vector unsigned char) { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; + expected_vresult_uchar + = (vector unsigned char) { 0, 0xc, 0x1, 0, 0, 0xc8, 1, 0, + 0, 2, 0, 0, 0, 0, 0, 0 }; /* Byte index 7 will over write least significant byte of element 0 */ - vresult_uchar = vec_replace_unaligned (src_va_ullint, src_a_ullint, 7); - vresult_ullint = (vector unsigned long long) vresult_uchar; + vresult_uchar = vec_replace_unaligned (src_va_uchar, src_a_ullint, 7); - if (!vec_all_eq (vresult_ullint, expected_vresult_ullint)) { + if (!vec_all_eq (vresult_uchar, expected_vresult_uchar)) { #if DEBUG - printf("ERROR, vec_replace_unaligned (src_vb_ullint, src_va_ullint, " + printf("ERROR, vec_replace_unaligned (src_va_uchar, src_va_ullint, " "index)\n"); - for(i = 0; i < 2; i++) - printf(" vresult_ullint[%d] = %d, expected_vresult_ullint[%d] = %d\n", - i, vresult_ullint[i], i, expected_vresult_ullint[i]); + for (i = 0; i < 15; i++) + printf(" vresult_uchar[%d] = 0x%x, expected_vresult_uchar[%d] = 0x%x\n", + i, vresult_uchar[i], i, expected_vresult_uchar[i]); #else abort(); #endif } src_a_llint = 678; - src_va_llint = (vector long long int) { 0, 0x101 }; + src_va_uchar = (vector unsigned char) { 0, 0xa6, 0x2, 0, 0, 0, 0, 0, + 0x0, 0x1, 0, 0, 0, 0, 0, 0 }; vresult_llint = (vector long long int) { 0, 0 }; /* Byte index 7 will over write least significant byte of element 0 */ - expected_vresult_llint = (vector long long int) { 678*256, 0x100 }; + expected_vresult_uchar + = (vector unsigned char) { 0x0, 0xa6, 0x2, 0x0, 0x0, 0xa6, 0x2, 0x0, + 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - vresult_uchar = vec_replace_unaligned (src_va_llint, src_a_llint, 7); - vresult_llint = (vector signed long long) vresult_uchar; + vresult_uchar = vec_replace_unaligned (src_va_uchar, src_a_llint, 7); - if (!vec_all_eq (vresult_llint, expected_vresult_llint)) { + if (!vec_all_eq (vresult_uchar, expected_vresult_uchar)) { #if DEBUG - printf("ERROR, vec_replace_unaligned (src_vb_llint, src_va_llint, " + printf("ERROR, vec_replace_unaligned (src_va_uchar, src_va_llint, " "index)\n"); - for(i = 0; i < 2; i++) - printf(" vresult_llint[%d] = %d, expected_vresult_llint[%d] = %d\n", - i, vresult_llint[i], i, expected_vresult_llint[i]); + for (i = 0; i < 16; i++) + printf(" vresult_uchar[%d] = %d, expected_vresult_uchar[%d] = %d\n", + i, vresult_uchar[i], i, expected_vresult_uchar[i]); #else abort(); #endif } src_a_double = 678.0; - src_va_double = (vector double) { 0.0, 50.0 }; + // src_va_double = (vector double) { 0.0, 50.0 }; + src_va_uchar = (vector unsigned char) { 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; vresult_double = (vector double) { 0.0, 0.0 }; expected_vresult_double = (vector double) { 0.0, 678.0 }; - vresult_uchar = vec_replace_unaligned (src_va_double, src_a_double, 0); + vresult_uchar = vec_replace_unaligned (src_va_uchar, src_a_double, 0); vresult_double = (vector double) vresult_uchar; - if (!vec_all_eq (vresult_double, expected_vresult_double)) { + if (!vec_all_eq (vresult_double, expected_vresult_double)) { #if DEBUG - printf("ERROR, vec_replace_unaligned (src_vb_double, src_va_double, " + printf("ERROR, vec_replace_unaligned (src_va_uchar, src_va_double, " "index)\n"); - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) printf(" vresult_double[%d] = %f, expected_vresult_double[%d] = %f\n", i, vresult_double[i], i, expected_vresult_double[i]); #else @@ -295,7 +312,5 @@ main (int argc, char *argv []) return 0; } -/* { dg-final { scan-assembler-times {\mvinsw\M} 6 } } */ -/* { dg-final { scan-assembler-times {\mvinsd\M} 6 } } */ - - +/* { dg-final { scan-assembler-times {\mvinsw\M} 8 } } */ +/* { dg-final { scan-assembler-times {\mvinsd\M} 4 } } */