From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 0DB1238582A8 for ; Mon, 24 Oct 2022 07:19:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0DB1238582A8 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666595965; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=/48I4fbjpVfPXYnyejqjwWsXg0/ktsHYVsUy0OZpLNI=; b=SULCqBTFwd2akIBHUheWfXqM7pPVZPavTKxAmaltQFKQ5CPX07pKMhkeMzGidCQ7SAFwpW GTrROyHXND7mboUn3jMlzcQNeA/Ncf0FaovvfFUwrg6ceToApbT2NTqQb89jSfEy6wBc4G Q3OUJN/KIzASWG58JvrdG+HVrrve1Fs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-XpxAw326OXCH1hVfJXYEGg-1; Mon, 24 Oct 2022 03:19:21 -0400 X-MC-Unique: XpxAw326OXCH1hVfJXYEGg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 819F4101A528; Mon, 24 Oct 2022 07:19:21 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.193.252]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 418DE49BB60; Mon, 24 Oct 2022 07:19:21 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 29O7JIoZ3042766 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Oct 2022 09:19:18 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 29O7JH1u3042765; Mon, 24 Oct 2022 09:19:17 +0200 Date: Mon, 24 Oct 2022 09:19:17 +0200 From: Jakub Jelinek To: "Joseph S. Myers" , Jason Merrill Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] c, c++: Fix up excess precision handling of scalar_to_vector conversion [PR107358] Message-ID: Reply-To: Jakub Jelinek MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: Hi! As mentioned earlier in the C++ excess precision support mail, the following testcase is broken with excess precision both in C and C++ (though just in C++ it was triggered in real-world code). scalar_to_vector is called in both FEs after the excess precision promotions (or stripping of EXCESS_PRECISION_EXPR), so we can then get invalid diagnostics that say float vector + float involves truncation (on ia32 from long double to float). The following patch fixes that by calling scalar_to_vector on the operands before the excess precision promotions, let scalar_to_vector just do the diagnostics (it does e.g. fold_for_warn so it will fold EXCESS_PRECISION_EXPR around REAL_CST to constants etc.) but will then do the actual conversions using the excess precision promoted operands (so say if we have vector double + (float + float) we don't actually do vector double + (float) ((long double) float + (long double) float) but vector double + (double) ((long double) float + (long double) float) Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2022-10-24 Jakub Jelinek PR c++/107358 c/ * c-typeck.cc (build_binary_op): Pass operands before excess precision promotions to scalar_to_vector call. cp/ * typeck.cc (cp_build_binary_op): Pass operands before excess precision promotions to scalar_to_vector call. testsuite/ * c-c++-common/pr107358.c: New test. * g++.dg/cpp1y/pr68180.C: Remove -fexcess-precision=fast from dg-options. --- gcc/c/c-typeck.cc.jj 2022-10-14 09:35:56.199990261 +0200 +++ gcc/c/c-typeck.cc 2022-10-22 17:54:24.378839301 +0200 @@ -11995,8 +11995,8 @@ build_binary_op (location_t location, en if ((gnu_vector_type_p (type0) && code1 != VECTOR_TYPE) || (gnu_vector_type_p (type1) && code0 != VECTOR_TYPE)) { - enum stv_conv convert_flag = scalar_to_vector (location, code, op0, op1, - true); + enum stv_conv convert_flag = scalar_to_vector (location, code, orig_op0, + orig_op1, true); switch (convert_flag) { --- gcc/cp/typeck.cc.jj 2022-10-20 13:54:22.535670240 +0200 +++ gcc/cp/typeck.cc 2022-10-22 17:56:58.589715301 +0200 @@ -5191,6 +5191,8 @@ cp_build_binary_op (const op_location_t orig_type0 = type0 = TREE_TYPE (op0); orig_type1 = type1 = TREE_TYPE (op1); + tree non_ep_op0 = op0; + tree non_ep_op1 = op1; /* The expression codes of the data types of the arguments tell us whether the arguments are integers, floating, pointers, etc. */ @@ -5303,8 +5305,9 @@ cp_build_binary_op (const op_location_t if ((gnu_vector_type_p (type0) && code1 != VECTOR_TYPE) || (gnu_vector_type_p (type1) && code0 != VECTOR_TYPE)) { - enum stv_conv convert_flag = scalar_to_vector (location, code, op0, op1, - complain & tf_error); + enum stv_conv convert_flag + = scalar_to_vector (location, code, non_ep_op0, non_ep_op1, + complain & tf_error); switch (convert_flag) { --- gcc/testsuite/c-c++-common/pr107358.c.jj 2022-10-22 18:46:59.390375310 +0200 +++ gcc/testsuite/c-c++-common/pr107358.c 2022-10-22 18:01:52.973660719 +0200 @@ -0,0 +1,30 @@ +/* PR c++/107358 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fexcess-precision=standard" } */ + +typedef float __attribute__((vector_size (4 * sizeof (float)))) A; +typedef double __attribute__((vector_size (2 * sizeof (double)))) B; + +void +foo (A *x) +{ + *x = *x - 124.225514990f; +} + +void +bar (A *x, float y) +{ + *x = *x - y; +} + +void +baz (B *x) +{ + *x = *x + 124.225514990f; +} + +void +qux (B *x, double y) +{ + *x = *x + y; +} --- gcc/testsuite/g++.dg/cpp1y/pr68180.C.jj 2022-10-14 09:28:28.339159477 +0200 +++ gcc/testsuite/g++.dg/cpp1y/pr68180.C 2022-10-22 17:59:07.012946513 +0200 @@ -1,6 +1,6 @@ // PR c++/68180 // { dg-do compile { target c++14 } } -// { dg-additional-options "-Wno-psabi -fexcess-precision=fast" } +// { dg-additional-options "-Wno-psabi" } typedef float __attribute__( ( vector_size( 16 ) ) ) float32x4_t; constexpr float32x4_t fill(float x) { Jakub