From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id mBn6NdiY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:12 -0500 Received: by simark.ca (Postfix, from userid 112) id DA8091F0B8; Fri, 1 Jan 2021 16:49:12 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id EE3011F0BE for ; Fri, 1 Jan 2021 16:49:11 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 182FC3898506; Fri, 1 Jan 2021 21:48:44 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 9B9BE3896C25 for ; Fri, 1 Jan 2021 21:48:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9B9BE3896C25 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 cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 475B610EB93E for ; Fri, 1 Jan 2021 15:48:38 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHmkzbJDDT64vSHmk79Mo; Fri, 01 Jan 2021 15:48:38 -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=PiGx4GQxaDHdjDeJkJXPFjmstpdvKhTHkW2KJV0DxSk=; b=pSdwOBL0yKj0Z0VWCME/h015Y4 sKnT/5vpML7rF9iglk1WPaOmYuD5NqT18HxnmI2pCbV1sanj8jXyibD71Wo8hlMos8Ke08WcHQH1k kam7NJPMnXSAD/XRQR++TO/Q/; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60416 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 1kvSHm-0029oI-34 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:38 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 149/203] Implement OpenCL logical binary operations Date: Fri, 1 Jan 2021 14:46:29 -0700 Message-Id: <20210101214723.1784144-150-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210101214723.1784144-1-tom@tromey.com> References: <20210101214723.1784144-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.81.39 X-Source-L: No X-Exim-ID: 1kvSHm-0029oI-34 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60416 X-Source-Auth: tom+tromey.com X-Email-Count: 150 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes 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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" This implements "&&" and "||" for OpenCL. gdb/ChangeLog 2021-01-01 Tom Tromey * opencl-lang.c (opencl_logical_binop_operation::evaluate): New method. * c-exp.h (class opencl_logical_binop_operation): New. --- gdb/ChangeLog | 6 ++++++ gdb/c-exp.h | 17 +++++++++++++++++ gdb/opencl-lang.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/gdb/c-exp.h b/gdb/c-exp.h index 58a16d5c0c8..f75b4aed952 100644 --- a/gdb/c-exp.h +++ b/gdb/c-exp.h @@ -186,6 +186,23 @@ class opencl_structop_operation { return STRUCTOP_STRUCT; } }; +/* This handles the "&&" and "||" operations for OpenCL. */ +class opencl_logical_binop_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 std::get<0> (m_storage); } +}; + }/* namespace expr */ #endif /* C_EXP_H */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index 317163966cd..cca8505cfac 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -984,6 +984,54 @@ opencl_structop_operation::evaluate (struct type *expect_type, } } +value * +opencl_logical_binop_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + enum exp_opcode op = std::get<0> (m_storage); + value *arg1 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + + /* For scalar operations we need to avoid evaluating operands + unnecessarily. However, for vector operations we always need to + evaluate both operands. Unfortunately we only know which of the + two cases apply after we know the type of the second operand. + Therefore we evaluate it once using EVAL_AVOID_SIDE_EFFECTS. */ + value *arg2 = std::get<2> (m_storage)->evaluate (nullptr, exp, + EVAL_AVOID_SIDE_EFFECTS); + struct type *type1 = check_typedef (value_type (arg1)); + struct type *type2 = check_typedef (value_type (arg2)); + + if ((type1->code () == TYPE_CODE_ARRAY && type1->is_vector ()) + || (type2->code () == TYPE_CODE_ARRAY && type2->is_vector ())) + { + arg2 = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + + return opencl_relop (nullptr, exp, noside, op, arg1, arg2); + } + else + { + /* For scalar built-in types, only evaluate the right + hand operand if the left hand operand compares + unequal(&&)/equal(||) to 0. */ + int tmp = value_logical_not (arg1); + + if (op == BINOP_LOGICAL_OR) + tmp = !tmp; + + if (!tmp) + { + arg2 = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + tmp = value_logical_not (arg2); + if (op == BINOP_LOGICAL_OR) + tmp = !tmp; + } + + type1 = language_bool_type (exp->language_defn, exp->gdbarch); + return value_from_longest (type1, tmp); + } +} + } /* namespace expr */ const struct exp_descriptor exp_descriptor_opencl = -- 2.26.2