From patchwork Fri Mar 3 00:17:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 63685 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp142180wrd; Thu, 2 Mar 2023 16:18:50 -0800 (PST) X-Google-Smtp-Source: AK7set+JKkElMqdRXcTguILI6R4cccrt8GT2+QpkIF13PgN3Gb9XzFK41aGdniHQWsHZ/MVEBXI/ X-Received: by 2002:a17:907:d489:b0:8f2:62a9:6159 with SMTP id vj9-20020a170907d48900b008f262a96159mr13422294ejc.2.1677802730191; Thu, 02 Mar 2023 16:18:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677802730; cv=none; d=google.com; s=arc-20160816; b=YVIPpamKczTqTh4h60KuSpu2tLZWfXQgzb8pro9/knYuiH7RclYLETSADkNqpR1wou Ify6vPJzmZpQ598FfYzpU9scv2l/RavRDUwQDwO2S6LD9vo9vIXEddtiuLA0VIe37pCW Stds/Hyn3tvR28Y2IeuxRpWGpUrbORrCc1J8hFvAY4flzU5tDmC573SR6ltduoLMo9wt Vfw8TgFivPa4g/Wjeyp41yhaI2O23vcLCCSrOSg3JHtSzZEH7VZzBQ6lJHUBSvbEpAFF 73vTHzKTcujtPM5/JioFMEShxHn5S/5kPs7ZVwWoWUvp9fdCLc1PTrdmye/7ocE0aBaT 6qwQ== 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:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=nhfImaUyvcoBBaocg2GgO3sNa1NX+CR4LDV6VQ+DHqc=; b=ukYXb1JUeA6M9J9Wlkch4kfVVWPRwDiyZQrIlWuUgdXGWcs1zMnfST+9dIos3ias8Y iJ/BITTA/xF8BEvPo2AYw20rhbfTyJVjdTLfJMhYswsOCnZPvSYDailyz+DM/uqxtyco +BNMR2KtRXFMImHY89ASWdtfpMqAtLiLm1hPwUaQJbmJkb13LpHJ+SvhbAtZAzJre9KD 98Dg7NvApWrDMGob3Ev3S3iHDLD8FFDDLdjJDwdw86xJCR5h0gWVEAojhBL8JYN/4tvL gdDJMI6BcU83aPKc5W9YBhcYNHz8iqHs+mWfheJ2OMLDMdHwERByr8vtWH4+y5e8uVKy IJlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wyCROfFh; 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=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id e18-20020a17090658d200b008b194cc10acsi896664ejs.381.2023.03.02.16.18.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 16:18:50 -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=@gcc.gnu.org header.s=default header.b=wyCROfFh; 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=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1CFB23858408 for ; Fri, 3 Mar 2023 00:18:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1CFB23858408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677802729; bh=nhfImaUyvcoBBaocg2GgO3sNa1NX+CR4LDV6VQ+DHqc=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=wyCROfFhlnkvVo3MXcQe+h9vsBNGIUzTxD+lz/wagoXmWzbmrTr8vR1enGk58dErh lIEMfPx++QAuVhyHeYX4ND2FoJ1zj8YSD8Y0iNopLJ7P66TADA8IiposI+i17gATid 5jHhQGkcAHnEkesSCsJeaTY82INOqXVZTNjrcUms= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by sourceware.org (Postfix) with ESMTPS id 5AF4E3858D37 for ; Fri, 3 Mar 2023 00:17:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5AF4E3858D37 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PST7s1WkNz9sSH; Fri, 3 Mar 2023 01:17:45 +0100 (CET) To: gcc-patches@gcc.gnu.org Cc: Iain Buclaw Subject: [committed] d: Allow vectors to be compared for identity (PR108946) Date: Fri, 3 Mar 2023 01:17:42 +0100 Message-Id: <20230303001742.4148863-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, 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 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: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw 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?1759303675822620506?= X-GMAIL-MSGID: =?utf-8?q?1759303675822620506?= Hi, Vector equality and comparisons are now accepted by the language implementation, but identity wasn't. This patch implements it as an extra integer comparison of the bit-casted bitmask. Bootstrapped and regression tested on x86_64-linux-gnu/-m32, and committed to mainline. Regards, Iain. --- PR d/108946 gcc/d/ChangeLog: * d-target.cc (Target::isVectorOpSupported): Allow identity ops. * expr.cc (ExprVisitor::visit (IdentityExp *)): Handle vector identity comparisons. gcc/testsuite/ChangeLog: * gdc.dg/simd2a.d: Update test. * gdc.dg/simd2b.d: Likewise. * gdc.dg/simd2c.d: Likewise. * gdc.dg/simd2d.d: Likewise. * gdc.dg/simd2e.d: Likewise. * gdc.dg/simd2f.d: Likewise. * gdc.dg/simd2g.d: Likewise. * gdc.dg/simd2h.d: Likewise. * gdc.dg/simd2i.d: Likewise. * gdc.dg/simd2j.d: Likewise. --- gcc/d/d-target.cc | 5 ----- gcc/d/expr.cc | 25 +++++++++++++++++++++++++ gcc/testsuite/gdc.dg/simd2a.d | 5 +++-- gcc/testsuite/gdc.dg/simd2b.d | 5 +++-- gcc/testsuite/gdc.dg/simd2c.d | 5 +++-- gcc/testsuite/gdc.dg/simd2d.d | 5 +++-- gcc/testsuite/gdc.dg/simd2e.d | 5 +++-- gcc/testsuite/gdc.dg/simd2f.d | 5 +++-- gcc/testsuite/gdc.dg/simd2g.d | 5 +++-- gcc/testsuite/gdc.dg/simd2h.d | 5 +++-- gcc/testsuite/gdc.dg/simd2i.d | 5 +++-- gcc/testsuite/gdc.dg/simd2j.d | 5 +++-- 12 files changed, 55 insertions(+), 25 deletions(-) diff --git a/gcc/d/d-target.cc b/gcc/d/d-target.cc index 5eab5706ead..4c7a212703e 100644 --- a/gcc/d/d-target.cc +++ b/gcc/d/d-target.cc @@ -323,11 +323,6 @@ Target::isVectorOpSupported (Type *type, EXP op, Type *) /* Logical operators must have a result type of bool. */ return false; - case EXP::identity: - case EXP::notIdentity: - /* Comparison operators must have a result type of bool. */ - return false; - default: break; } diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc index c8ec37d7103..4311edcc2d6 100644 --- a/gcc/d/expr.cc +++ b/gcc/d/expr.cc @@ -313,6 +313,31 @@ public: this->result_ = build_struct_comparison (code, ts->sym, t1, t2); } + else if (tb1->ty == TY::Tvector && tb2->ty == TY::Tvector) + { + /* For vectors, identity is defined as all values being equal. */ + tree t1 = build_expr (e->e1); + tree t2 = build_expr (e->e2); + tree mask = build_boolop (code, t1, t2); + + /* To reinterpret the vector comparison as a boolean expression, bitcast + the bitmask result and generate an additional integer comparison. */ + opt_scalar_int_mode mode = + int_mode_for_mode (TYPE_MODE (TREE_TYPE (mask))); + gcc_assert (mode.exists ()); + + tree type = lang_hooks.types.type_for_mode (mode.require (), 1); + if (type == NULL_TREE) + type = make_unsigned_type (GET_MODE_BITSIZE (mode.require ())); + + /* In `t1 is t2', all mask bits must be set for vectors to be equal. + Otherwise any bit set is enough for vectors to be not-equal. */ + tree mask_eq = (code == EQ_EXPR) + ? build_all_ones_cst (type) : build_zero_cst (type); + + this->result_ = build_boolop (code, mask_eq, + build_vconvert (type, mask)); + } else { /* For operands of other types, identity is defined as being the diff --git a/gcc/testsuite/gdc.dg/simd2a.d b/gcc/testsuite/gdc.dg/simd2a.d index 373d5d1e229..d47175fd38b 100644 --- a/gcc/testsuite/gdc.dg/simd2a.d +++ b/gcc/testsuite/gdc.dg/simd2a.d @@ -5,6 +5,7 @@ import core.simd; void test2a() { byte16 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2a() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2b.d b/gcc/testsuite/gdc.dg/simd2b.d index e72da0d9b77..a1b2a10caaf 100644 --- a/gcc/testsuite/gdc.dg/simd2b.d +++ b/gcc/testsuite/gdc.dg/simd2b.d @@ -5,6 +5,7 @@ import core.simd; void test2b() { ubyte16 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2b() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2c.d b/gcc/testsuite/gdc.dg/simd2c.d index dc4954e2194..ca8d1000306 100644 --- a/gcc/testsuite/gdc.dg/simd2c.d +++ b/gcc/testsuite/gdc.dg/simd2c.d @@ -5,6 +5,7 @@ import core.simd; void test2c() { short8 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2c() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2d.d b/gcc/testsuite/gdc.dg/simd2d.d index 2d782bac89c..e928d4be601 100644 --- a/gcc/testsuite/gdc.dg/simd2d.d +++ b/gcc/testsuite/gdc.dg/simd2d.d @@ -5,6 +5,7 @@ import core.simd; void test2d() { ushort8 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2d() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2e.d b/gcc/testsuite/gdc.dg/simd2e.d index b6d4ed6ef3a..a611ea770c9 100644 --- a/gcc/testsuite/gdc.dg/simd2e.d +++ b/gcc/testsuite/gdc.dg/simd2e.d @@ -5,6 +5,7 @@ import core.simd; void test2e() { int4 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2e() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2f.d b/gcc/testsuite/gdc.dg/simd2f.d index df8f13fddd1..1e9d6c264a8 100644 --- a/gcc/testsuite/gdc.dg/simd2f.d +++ b/gcc/testsuite/gdc.dg/simd2f.d @@ -5,6 +5,7 @@ import core.simd; void test2f() { uint4 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2f() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2g.d b/gcc/testsuite/gdc.dg/simd2g.d index 028b25e7d17..7183304b223 100644 --- a/gcc/testsuite/gdc.dg/simd2g.d +++ b/gcc/testsuite/gdc.dg/simd2g.d @@ -5,6 +5,7 @@ import core.simd; void test2g() { long2 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2g() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2h.d b/gcc/testsuite/gdc.dg/simd2h.d index 6c3e91a8814..8c55e0117af 100644 --- a/gcc/testsuite/gdc.dg/simd2h.d +++ b/gcc/testsuite/gdc.dg/simd2h.d @@ -5,6 +5,7 @@ import core.simd; void test2h() { ulong2 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2h() v1 = v2 ^ v3; static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2i.d b/gcc/testsuite/gdc.dg/simd2i.d index 2fa7f3ad86e..d9ff6889ea2 100644 --- a/gcc/testsuite/gdc.dg/simd2i.d +++ b/gcc/testsuite/gdc.dg/simd2i.d @@ -5,6 +5,7 @@ import core.simd; void test2i() { float4 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2i() static assert(!__traits(compiles, v1 ^ v2)); static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2)); diff --git a/gcc/testsuite/gdc.dg/simd2j.d b/gcc/testsuite/gdc.dg/simd2j.d index 7c2d12f33cf..a84120f3cce 100644 --- a/gcc/testsuite/gdc.dg/simd2j.d +++ b/gcc/testsuite/gdc.dg/simd2j.d @@ -5,6 +5,7 @@ import core.simd; void test2j() { double2 v1, v2 = 1, v3 = 1; + bool b1; v1 = v2; v1 = v2 + v3; v1 = v2 - v3; @@ -16,8 +17,8 @@ void test2j() static assert(!__traits(compiles, v1 ^ v2)); static assert(!__traits(compiles, v1 ~ v2)); static assert(!__traits(compiles, v1 ^^ v2)); - static assert(!__traits(compiles, v1 is v2)); - static assert(!__traits(compiles, v1 !is v2)); + b1 = v1 is v2; + b1 = v1 !is v2; static assert( __traits(compiles, v1 == v2)); static assert( __traits(compiles, v1 != v2)); static assert( __traits(compiles, v1 < v2));