From patchwork Sun Jul 7 12:02:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Glisse X-Patchwork-Id: 257322 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id E6F632C00A0 for ; Sun, 7 Jul 2013 22:02:20 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=kGRX6ngDHbDE8HyItqSqMtxatXRR+wgyfmyGK7hP0TBI3y10Pq 3cnDUK2AMQ7SXONMpmBf4KkZgb4/HRTHRsmdu+7JYLk9+5tyDdQtmmJVzaXjN+lW VYhY898+MyZtgp1o1NmtYRNuZjB8WmUM03SYxI9dF1jKggxIeRlroqpTw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=K36LJU76nuS5tfvZMWyzNF9yCFI=; b=k0omBLfkrc1qKGU/lhH9 07EaJlBrSgC4W4eV8tPr8Z/wD9sR4M3RcrmWXhk2LMEPuoxLYVgYL5pai6noKZ0T qs8HrSOWlcZtinN9W8u21nx2taNu+zmRgYLD66CFT7CUCZ0OuWtCXGY+SA1I/Lxi RE592MB63jvb7u2uOZQaB9Y= Received: (qmail 2817 invoked by alias); 7 Jul 2013 12:02:12 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 2701 invoked by uid 89); 7 Jul 2013 12:02:06 -0000 X-Spam-SWARE-Status: No, score=-6.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RP_MATCHES_RCVD autolearn=ham version=3.3.1 Received: from mail3-relais-sop.national.inria.fr (HELO mail3-relais-sop.national.inria.fr) (192.134.164.104) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sun, 07 Jul 2013 12:02:04 +0000 Received: from stedding.saclay.inria.fr ([193.55.250.194]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 07 Jul 2013 14:02:01 +0200 Received: from glisse (helo=localhost) by stedding.saclay.inria.fr with local-esmtp (Exim 4.80) (envelope-from ) id 1UvnfF-0002Aq-91; Sun, 07 Jul 2013 14:02:01 +0200 Date: Sun, 7 Jul 2013 14:02:01 +0200 (CEST) From: Marc Glisse To: gcc-patches@gcc.gnu.org cc: jason@redhat.com Subject: vector conditional expression with scalar arguments Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Virus-Found: No Hello, this patch lets us write (vec<0)?-1:1 without having to manually construct a vector of 1s. It seems preferable to the hacks we can currently use, like (vec!=vec)+1. The patch also fixes a few bugs along the way. Bootstrap+testsuite on x86_64-unknown-linux-gnu. 2013-07-07 Marc Glisse gcc/cp/ * call.c (build_conditional_expr_1): Handle the case with 1 vector and 2 scalars. Call save_expr before building a vector. * typeck.c (cp_build_binary_op): Check complain before complaining. gcc/testsuite/ * g++.dg/ext/vector19.C: Adapt. * g++.dg/ext/vector23.C: New testcase. Index: testsuite/g++.dg/ext/vector19.C =================================================================== --- testsuite/g++.dg/ext/vector19.C (revision 200742) +++ testsuite/g++.dg/ext/vector19.C (working copy) @@ -30,22 +30,21 @@ void i2 (vec2 *x, vec2 *y, vec2u *z) { *x = *y ? *x : *y; *y = *z ? *x : *y; } void j (vec2 *x, vec2 *y, vec2 *z, vec *t) { *x = (*y < *z) ? *x : 4.2; /* { dg-error "" } */ *y = (*x < *z) ? 2.5 : *y; /* { dg-error "" } */ *t = *t ? *t : *t; /* { dg-error "" } */ - *z = (*x < *z) ? '1' : '0'; /* { dg-error "" } */ - // The last one may eventually be accepted. + *z = (*x < *z) ? '1' : '0'; } template auto k (A *a, B b) -> decltype (*a ? *a : b); void k (...) {} void l (vec2 *v, double x) { k (v, x); Index: testsuite/g++.dg/ext/vector23.C =================================================================== --- testsuite/g++.dg/ext/vector23.C (revision 0) +++ testsuite/g++.dg/ext/vector23.C (revision 0) @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-std=gnu++1y" } */ + +typedef long vecl __attribute__((vector_size(4*sizeof(long)))); +typedef short vecs __attribute__((vector_size(8*sizeof(short)))); +typedef char vecc __attribute__((vector_size(16*sizeof(char)))); + +auto f(vecl*a,float d,char i){ + return (*a<0)?d:i; +} +auto g(vecs*a){ + return (*a<0)?3LL:42UL; +} +auto h(vecc*a){ + return (*a<0)?1:0.; // { dg-error "could not find a floating point type" } +} Property changes on: testsuite/g++.dg/ext/vector23.C ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision URL Index: cp/typeck.c =================================================================== --- cp/typeck.c (revision 200742) +++ cp/typeck.c (working copy) @@ -4528,37 +4528,52 @@ cp_build_binary_op (location_t location, warning (OPT_Waddress, "comparison with string literal results in unspecified behaviour"); } if (code0 == VECTOR_TYPE && code1 == VECTOR_TYPE) { vector_compare: tree intt; if (!same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (type0), TREE_TYPE (type1))) { - error_at (location, "comparing vectors with different " - "element types"); - inform (location, "operand types are %qT and %qT", type0, type1); + if (complain & tf_error) + { + error_at (location, "comparing vectors with different " + "element types"); + inform (location, "operand types are %qT and %qT", + type0, type1); + } return error_mark_node; } if (TYPE_VECTOR_SUBPARTS (type0) != TYPE_VECTOR_SUBPARTS (type1)) { - error_at (location, "comparing vectors with different " - "number of elements"); - inform (location, "operand types are %qT and %qT", type0, type1); + if (complain & tf_error) + { + error_at (location, "comparing vectors with different " + "number of elements"); + inform (location, "operand types are %qT and %qT", + type0, type1); + } return error_mark_node; } /* Always construct signed integer vector type. */ intt = c_common_type_for_size (GET_MODE_BITSIZE (TYPE_MODE (TREE_TYPE (type0))), 0); + if (!intt) + { + if (complain & tf_error) + error_at (location, "could not find an integer type " + "of the same size as %qT", TREE_TYPE (type0)); + return error_mark_node; + } result_type = build_opaque_vector_type (intt, TYPE_VECTOR_SUBPARTS (type0)); converted = 1; break; } build_type = boolean_type_node; if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE || code0 == ENUMERAL_TYPE) && (code1 == INTEGER_TYPE || code1 == REAL_TYPE || code1 == ENUMERAL_TYPE)) Index: cp/call.c =================================================================== --- cp/call.c (revision 200742) +++ cp/call.c (working copy) @@ -4398,46 +4398,115 @@ build_conditional_expr_1 (location_t loc arg2 = force_rvalue (arg2, complain); arg3 = force_rvalue (arg3, complain); tree arg1_type = TREE_TYPE (arg1); arg2_type = TREE_TYPE (arg2); arg3_type = TREE_TYPE (arg3); if (TREE_CODE (arg2_type) != VECTOR_TYPE && TREE_CODE (arg3_type) != VECTOR_TYPE) { - if (complain & tf_error) - error_at (loc, "at least one operand of a vector conditional " - "operator must be a vector"); - return error_mark_node; + /* Rely on the error messages of the scalar version. */ + tree scal = build_conditional_expr_1 (loc, integer_one_node, + orig_arg2, orig_arg3, complain); + if (scal == error_mark_node) + return error_mark_node; + tree stype = TREE_TYPE (scal); + tree ctype = TREE_TYPE (arg1_type); + if (TYPE_SIZE (stype) == TYPE_SIZE (ctype) + && (INTEGRAL_TYPE_P (stype) || SCALAR_FLOAT_TYPE_P (stype))) + ; + /* Guess a type of the right size. */ + else if (INTEGRAL_TYPE_P (stype)) + { + stype = c_common_type_for_size (GET_MODE_BITSIZE + (TYPE_MODE (ctype)), TYPE_UNSIGNED (stype)); + if (!stype) + { + if (complain & tf_error) + error_at (loc, "could not find an integer type " + "of the same size as %qT", ctype); + return error_mark_node; + } + } + else if (SCALAR_FLOAT_TYPE_P (stype)) + { + if (TYPE_SIZE (ctype) == TYPE_SIZE (float_type_node)) + stype = float_type_node; + else if (TYPE_SIZE (ctype) == TYPE_SIZE (double_type_node)) + stype = double_type_node; + else if (TYPE_SIZE (ctype) == TYPE_SIZE (long_double_type_node)) + stype = long_double_type_node; + else + { + if (complain & tf_error) + error_at (loc, "could not find a floating point type " + "of the same size as %qT", ctype); + return error_mark_node; + } + } + else + { + if (complain & tf_error) + error_at (loc, "guessing a type for conditional expressions is " + "only implemented for integers and floating point"); + return error_mark_node; + } + tree vtype = build_opaque_vector_type (stype, + TYPE_VECTOR_SUBPARTS (arg1_type)); + if (unsafe_conversion_p (stype, arg2, complain & tf_warning)) + { + if (complain & tf_error) + error_at (loc, "conversion of scalar %qT to vector %qT " + "involves truncation", arg2_type, vtype); + return error_mark_node; + } + if (unsafe_conversion_p (stype, arg3, complain & tf_warning)) + { + if (complain & tf_error) + error_at (loc, "conversion of scalar %qT to vector %qT " + "involves truncation", arg3_type, vtype); + return error_mark_node; + } + + arg2 = cp_convert (stype, arg2, complain); + arg2 = save_expr (arg2); + arg2 = build_vector_from_val (vtype, arg2); + arg2_type = vtype; + arg3 = cp_convert (stype, arg3, complain); + arg3 = save_expr (arg3); + arg3 = build_vector_from_val (vtype, arg3); + arg3_type = vtype; } if ((TREE_CODE (arg2_type) == VECTOR_TYPE) != (TREE_CODE (arg3_type) == VECTOR_TYPE)) { enum stv_conv convert_flag = scalar_to_vector (loc, VEC_COND_EXPR, arg2, arg3, complain & tf_error); switch (convert_flag) { case stv_error: return error_mark_node; case stv_firstarg: { + arg2 = save_expr (arg2); arg2 = convert (TREE_TYPE (arg3_type), arg2); arg2 = build_vector_from_val (arg3_type, arg2); arg2_type = TREE_TYPE (arg2); break; } case stv_secondarg: { + arg3 = save_expr (arg3); arg3 = convert (TREE_TYPE (arg2_type), arg3); arg3 = build_vector_from_val (arg2_type, arg3); arg3_type = TREE_TYPE (arg3); break; } default: break; } }