From patchwork Sun Dec 11 15:45:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1714669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=UVUyuGtU; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NVTcj5tFGz23yc for ; Mon, 12 Dec 2022 02:45:56 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 906E0380FAD5 for ; Sun, 11 Dec 2022 15:45:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 906E0380FAD5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670773553; bh=LCdyhGS5j/uls0fowH3ozUOxNlAPMzs4MqgPAYodPNU=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=UVUyuGtU5T+FNeZ7uzo/qJDTfKxunxMkP0dxAFqjtVxG+bjWZR2ELTVw5VCD59NlS nSQgajtZnqSAvNn8nDHuzDgj5QemoXMM9NNXvxJ2n1ZAsZTNf3M4c7036ElHMjWxP2 FQwHOE4k9M1PH2tijaqyK/WQ1NGh54GmNi8ONyrU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) by sourceware.org (Postfix) with ESMTPS id 74C023864A05 for ; Sun, 11 Dec 2022 15:45:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 74C023864A05 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (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-101.mailbox.org (Postfix) with ESMTPS id 4NVTc63fbcz9sPp; Sun, 11 Dec 2022 16:45:26 +0100 (CET) To: gcc-patches@gcc.gnu.org Cc: Iain Buclaw Subject: [committed] d: Expand bsr intrinsic as `clz(arg) ^ (argsize - 1)' Date: Sun, 11 Dec 2022 16:45:19 +0100 Message-Id: <20221211154519.2681701-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4NVTc63fbcz9sPp X-Spam-Status: No, score=-13.5 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi, This patch tweaks the code expansion of the D intrinsic bsr() function. As well as removing unnecessary casts, this results in less temporaries being generated during the initial gimple lowering pass. Otherwise the code generated is identical to the former intrinsic expansion. Bootstrapped and regression tested on x86_64-linux-gnu/-m32. Committed to mainline. Regards, Iain. --- gcc/d/ChangeLog: * intrinsics.cc (expand_intrinsic_bsf): Fix comment. (expand_intrinsic_bsr): Use BIT_XOR_EXPR instead of MINUS_EXPR. --- gcc/d/intrinsics.cc | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gcc/d/intrinsics.cc b/gcc/d/intrinsics.cc index 6d9f74a6d7a..46380e512c4 100644 --- a/gcc/d/intrinsics.cc +++ b/gcc/d/intrinsics.cc @@ -525,7 +525,7 @@ call_builtin_fn (tree callexp, built_in_function code, int n, ...) static tree expand_intrinsic_bsf (tree callexp) { - /* The bsr() intrinsic gets turned into __builtin_ctz(arg). + /* The bsf() intrinsic gets turned into __builtin_ctz(arg). The return value is supposed to be undefined if arg is zero. */ tree arg = CALL_EXPR_ARG (callexp, 0); int argsize = TYPE_PRECISION (TREE_TYPE (arg)); @@ -554,11 +554,11 @@ expand_intrinsic_bsf (tree callexp) static tree expand_intrinsic_bsr (tree callexp) { - /* The bsr() intrinsic gets turned into (size - 1) - __builtin_clz(arg). + /* The bsr() intrinsic gets turned into __builtin_clz(arg) ^ (size - 1). The return value is supposed to be undefined if arg is zero. */ tree arg = CALL_EXPR_ARG (callexp, 0); - tree type = TREE_TYPE (arg); - int argsize = TYPE_PRECISION (type); + tree type = TREE_TYPE (callexp); + int argsize = TYPE_PRECISION (TREE_TYPE (arg)); /* Which variant of __builtin_clz* should we call? */ built_in_function code = (argsize <= INT_TYPE_SIZE) ? BUILT_IN_CLZ @@ -570,13 +570,8 @@ expand_intrinsic_bsr (tree callexp) tree result = call_builtin_fn (callexp, code, 1, arg); - /* Handle int -> long conversions. */ - if (TREE_TYPE (result) != type) - result = fold_convert (type, result); - - result = fold_build2 (MINUS_EXPR, type, - build_integer_cst (argsize - 1, type), result); - return fold_convert (TREE_TYPE (callexp), result); + return fold_build2 (BIT_XOR_EXPR, type, result, + build_integer_cst (argsize - 1, type)); } /* Expand a front-end intrinsic call to INTRINSIC, which is either a call to