From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AMfJFNiY718XTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:12 -0500 Received: by simark.ca (Postfix, from userid 112) id 517291F0C2; Fri, 1 Jan 2021 16:49:11 -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 E39791F0BE for ; Fri, 1 Jan 2021 16:49:08 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8CC8A3896C3B; Fri, 1 Jan 2021 21:48:42 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 1CDC23896C10 for ; Fri, 1 Jan 2021 21:48:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1CDC23896C10 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 cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway33.websitewelcome.com (Postfix) with ESMTP id B729010EB926 for ; Fri, 1 Jan 2021 15:48:37 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHlka1jvnPrxvSHlkleBD; Fri, 01 Jan 2021 15:48:37 -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=IQTOdAD7A/8jQH82QBE1s1/t/5E4a9JSUfqKafsrTx4=; b=oxfmM/+p3xU+2jk+nqeQXzavfL NYOuE5nbu5W+DVCeeR8PwJRJ9atzN85tUuFgqcSQwmr+vcKFqPHWYsKP3Ul5hWyTobXiPESnrq7U2 oIzBZbV8OR2TshHPWlVxiLmuC; 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 1kvSHl-0029oI-Hl for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:37 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 146/203] Implement OpenCL binary operations Date: Fri, 1 Jan 2021 14:46:26 -0700 Message-Id: <20210101214723.1784144-147-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: 1kvSHl-0029oI-Hl 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: 147 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 various OpenCL binary operations, adding a new template class to do so. gdb/ChangeLog 2021-01-01 Tom Tromey * opencl-lang.c (opencl_relop, eval_opencl_assign): No longer static. Change parameters. (eval_opencl_assign): No longer static. Add "op" parameter. (evaluate_subexp_opencl): Update. * c-exp.h (opencl_binop_operation): New template class. (opencl_assign_operation, opencl_equal_operation) (opencl_notequal_operation, opencl_less_operation) (opencl_gtr_operation, opencl_geq_operation) (opencl_leq_operation): New typedefs. --- gdb/ChangeLog | 12 +++++++++++ gdb/c-exp.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++ gdb/opencl-lang.c | 17 ++++++++-------- 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/gdb/c-exp.h b/gdb/c-exp.h index 68efa62c5a8..dc92e7a49a8 100644 --- a/gdb/c-exp.h +++ b/gdb/c-exp.h @@ -28,6 +28,16 @@ extern struct value *eval_op_objc_selector (struct type *expect_type, enum noside noside, const char *sel); extern struct value *opencl_value_cast (struct type *type, struct value *arg); +extern struct value *eval_opencl_assign (struct type *expect_type, + struct expression *exp, + enum noside noside, + enum exp_opcode op, + struct value *arg1, + struct value *arg2); +extern struct value *opencl_relop (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2); namespace expr { @@ -110,6 +120,48 @@ class objc_msgcall_operation using opencl_cast_type_operation = cxx_cast_operation; +/* Binary operations, as needed for OpenCL. */ +template> +class opencl_binop_operation + : public BASE +{ +public: + + using BASE::BASE; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *lhs + = std::get<0> (this->m_storage)->evaluate (nullptr, exp, noside); + value *rhs + = std::get<1> (this->m_storage)->evaluate (value_type (lhs), exp, + noside); + return FUNC (expect_type, exp, noside, OP, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return OP; } +}; + +using opencl_assign_operation = opencl_binop_operation; +using opencl_equal_operation = opencl_binop_operation; +using opencl_notequal_operation = opencl_binop_operation; +using opencl_less_operation = opencl_binop_operation; +using opencl_gtr_operation = opencl_binop_operation; +using opencl_geq_operation = opencl_binop_operation; +using opencl_leq_operation = opencl_binop_operation; + }/* namespace expr */ #endif /* C_EXP_H */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index c31eb51a390..01456055015 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -631,9 +631,10 @@ opencl_value_cast (struct type *type, struct value *arg) /* Perform a relational operation on two operands. */ -static struct value * -opencl_relop (struct expression *exp, struct value *arg1, struct value *arg2, - enum exp_opcode op) +struct value * +opencl_relop (struct type *expect_type, struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2) { struct value *val; struct type *type1 = check_typedef (value_type (arg1)); @@ -673,9 +674,9 @@ opencl_relop (struct expression *exp, struct value *arg1, struct value *arg2, /* A helper function for BINOP_ASSIGN. */ -static struct value * +struct value * eval_opencl_assign (struct type *expect_type, struct expression *exp, - enum noside noside, + enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) { if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) @@ -712,7 +713,7 @@ evaluate_subexp_opencl (struct type *expect_type, struct expression *exp, type1 = value_type (arg1); arg2 = evaluate_subexp (type1, exp, pos, noside); - return eval_opencl_assign (expect_type, exp, noside, arg1, arg2); + return eval_opencl_assign (expect_type, exp, noside, op, arg1, arg2); case UNOP_CAST: type1 = exp->elts[*pos + 1].type; @@ -753,7 +754,7 @@ evaluate_subexp_opencl (struct type *expect_type, struct expression *exp, return value_from_longest (builtin_type (exp->gdbarch)-> builtin_int, 1); - return opencl_relop (exp, arg1, arg2, op); + return opencl_relop (expect_type, exp, noside, op, arg1, arg2); /* Handle the logical unary operator not(!). */ case UNOP_LOGICAL_NOT: @@ -798,7 +799,7 @@ evaluate_subexp_opencl (struct type *expect_type, struct expression *exp, { arg2 = evaluate_subexp (nullptr, exp, pos, noside); - return opencl_relop (exp, arg1, arg2, op); + return opencl_relop (nullptr, exp, noside, op, arg1, arg2); } else { -- 2.26.2