From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.51.202]) by sourceware.org (Postfix) with ESMTPS id 3B60E3955424 for ; Sat, 20 Feb 2021 20:16:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3B60E3955424 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway24.websitewelcome.com (Postfix) with ESMTP id D446ED84D for ; Sat, 20 Feb 2021 14:16:45 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYgHlzWK2iQiZDYgHlHH6G; Sat, 20 Feb 2021 14:16:45 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=zw91DWXKc0QbYblf/pXY7Q1cz7yE2qaUItUT8xT9T1A=; b=ij0ytDPuO21Dn9e99PDuft3qUU vCUfQqUa/EJxrPCEIBYpQuWPWoXQXj9IBy1owQ1SGohZKNDbSslXNnf+q10Iv+gr7rEHqk/AydVbf A8hSf+1Ei0MlU5EEqFpWOTw49; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52702 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lDYgH-000GmE-Ki for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:45 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 153/206] Implement OpenCL ternary conditional operator Date: Sat, 20 Feb 2021 13:15:16 -0700 Message-Id: <20210220201609.838264-154-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.70.152 X-Source-L: No X-Exim-ID: 1lDYgH-000GmE-Ki X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52702 X-Source-Auth: tom+tromey.com X-Email-Count: 154 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3032.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Feb 2021 20:17:00 -0000 This implements the ?: ternary conditional operator for OpenCL. gdb/ChangeLog 2021-02-20 Tom Tromey * opencl-lang.c (opencl_ternop_cond_operation::evaluate): New method. * c-exp.h (class opencl_ternop_cond_operation): New. --- gdb/ChangeLog | 6 ++++ gdb/c-exp.h | 16 +++++++++ gdb/opencl-lang.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/gdb/c-exp.h b/gdb/c-exp.h index f75b4aed952..0ce2bd6eb22 100644 --- a/gdb/c-exp.h +++ b/gdb/c-exp.h @@ -203,6 +203,22 @@ class opencl_logical_binop_operation { return std::get<0> (m_storage); } }; +/* The ?: ternary operator for OpenCL. */ +class opencl_ternop_cond_operation + : public tuple_holding_operation +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return TERNOP_COND; } +}; + }/* namespace expr */ #endif /* C_EXP_H */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index cca8505cfac..c5150953022 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -1032,6 +1032,91 @@ opencl_logical_binop_operation::evaluate (struct type *expect_type, } } +value * +opencl_ternop_cond_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + struct type *type1 = check_typedef (value_type (arg1)); + if (type1->code () == TYPE_CODE_ARRAY && type1->is_vector ()) + { + struct value *arg2, *arg3, *tmp, *ret; + struct type *eltype2, *type2, *type3, *eltype3; + int t2_is_vec, t3_is_vec, i; + LONGEST lowb1, lowb2, lowb3, highb1, highb2, highb3; + + arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + arg3 = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + type2 = check_typedef (value_type (arg2)); + type3 = check_typedef (value_type (arg3)); + t2_is_vec + = type2->code () == TYPE_CODE_ARRAY && type2->is_vector (); + t3_is_vec + = type3->code () == TYPE_CODE_ARRAY && type3->is_vector (); + + /* Widen the scalar operand to a vector if necessary. */ + if (t2_is_vec || !t3_is_vec) + { + arg3 = opencl_value_cast (type2, arg3); + type3 = value_type (arg3); + } + else if (!t2_is_vec || t3_is_vec) + { + arg2 = opencl_value_cast (type3, arg2); + type2 = value_type (arg2); + } + else if (!t2_is_vec || !t3_is_vec) + { + /* Throw an error if arg2 or arg3 aren't vectors. */ + error (_("\ +Cannot perform conditional operation on incompatible types")); + } + + eltype2 = check_typedef (TYPE_TARGET_TYPE (type2)); + eltype3 = check_typedef (TYPE_TARGET_TYPE (type3)); + + if (!get_array_bounds (type1, &lowb1, &highb1) + || !get_array_bounds (type2, &lowb2, &highb2) + || !get_array_bounds (type3, &lowb3, &highb3)) + error (_("Could not determine the vector bounds")); + + /* Throw an error if the types of arg2 or arg3 are incompatible. */ + if (eltype2->code () != eltype3->code () + || TYPE_LENGTH (eltype2) != TYPE_LENGTH (eltype3) + || eltype2->is_unsigned () != eltype3->is_unsigned () + || lowb2 != lowb3 || highb2 != highb3) + error (_("\ +Cannot perform operation on vectors with different types")); + + /* Throw an error if the sizes of arg1 and arg2/arg3 differ. */ + if (lowb1 != lowb2 || lowb1 != lowb3 + || highb1 != highb2 || highb1 != highb3) + error (_("\ +Cannot perform conditional operation on vectors with different sizes")); + + ret = allocate_value (type2); + + for (i = 0; i < highb1 - lowb1 + 1; i++) + { + tmp = value_logical_not (value_subscript (arg1, i)) ? + value_subscript (arg3, i) : value_subscript (arg2, i); + memcpy (value_contents_writeable (ret) + + i * TYPE_LENGTH (eltype2), value_contents_all (tmp), + TYPE_LENGTH (eltype2)); + } + + return ret; + } + else + { + if (value_logical_not (arg1)) + return std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + else + return std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + } +} + } /* namespace expr */ const struct exp_descriptor exp_descriptor_opencl = -- 2.26.2