From patchwork Wed Aug 8 14:35:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10560075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64C351057 for ; Wed, 8 Aug 2018 14:35:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 534B6284A3 for ; Wed, 8 Aug 2018 14:35:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 479422AE75; Wed, 8 Aug 2018 14:35:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DA87284A3 for ; Wed, 8 Aug 2018 14:35:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727146AbeHHQzf (ORCPT ); Wed, 8 Aug 2018 12:55:35 -0400 Received: from mail-ed1-f47.google.com ([209.85.208.47]:46503 "EHLO mail-ed1-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727109AbeHHQze (ORCPT ); Wed, 8 Aug 2018 12:55:34 -0400 Received: by mail-ed1-f47.google.com with SMTP id o8-v6so1349683edt.13 for ; Wed, 08 Aug 2018 07:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qeku+XsE83PZZKJifDLfw/R0GFA/5bvfHPe0ZhyKl6Y=; b=qYf3VuZ7mnaZc23wg/FAiqlqP1kCsX6yfVE/JNxWCgSlCJb1nLGdHrJx5rJTibhpKf BYZgW9YixlN39cPQBnYKrOjx16vc949PU3Ikj6LVMf/gMOrxwjxLbxwglngujfKQ0Hux 5jQs2hLqKoJGwQYldBljR1hGWr5MKq+2Ud8Wq60jEMB99939zk5v50rfu3dKE/TWC00y q6EjKv+FwyM48nz6o7JaaptJPnFXSUtjZAfOkYmCPwr5/Rh9/dhpgl0hEBuJRrOXTGKz 47GZxYOVqhaQs45lm7FkmmcuAzkffgmDoK5p3SaNrtUxCaBPkX/gN6JwxaJgzRxECw4c Z92A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qeku+XsE83PZZKJifDLfw/R0GFA/5bvfHPe0ZhyKl6Y=; b=dmFJDA+LilQXQnfGGUXM3dG9A9Md1E16dGAaMPJXPTj72oJ6e7DSiThmxpBw8loYzZ hNyBNN/kOJa0QhhWg0A+PAVYyfQQQdaGxxWOrS0WrqZZtUp42r9CI2MKx7fTKvvSuw/1 6KvLTEsKPhJE6j62UKRd+Cq88ZgKv6gSsotckcVOqzkcraj/alJuVZPlR50LMEWs7Id4 nhr8iT6/HXPuwKO/CVeUq0/3IhRd+0kCsmKOSOYF0ZM1ntDqt13UtfGdTXj2Nfi9H3dQ o3eB3uv0dH+mdCjtOWVR2IuxdSfqCdNNssSbiULrz04fYII8MfTiBIdfQmMI7GFjjcwL CA4Q== X-Gm-Message-State: AOUpUlHHPk/QpPwM37Qtl0Y7dzNEg/j7cWgba7sAxDZJV2whaiDQNZNn G19MSlL7K3R0VaphnwnQVe7GATQv X-Google-Smtp-Source: AA+uWPxWoYBHCefgugl9wQ5ox2T7mgV/CTY1cyBQbUkmFLdGSjBizPV/F9pdVOBlqwL7t5WI8lffSw== X-Received: by 2002:aa7:c910:: with SMTP id b16-v6mr3673764edt.22.1533738936714; Wed, 08 Aug 2018 07:35:36 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4190:df00:d40b:3370:36b2:17ad]) by smtp.gmail.com with ESMTPSA id m20-v6sm1835326eds.5.2018.08.08.07.35.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Aug 2018 07:35:36 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH 4/9] dumber simplify_and_or_mask() Date: Wed, 8 Aug 2018 16:35:23 +0200 Message-Id: <20180808143528.82880-5-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180808143528.82880-1-luc.vanoostenryck@gmail.com> References: <20180808143528.82880-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, in simplify_and_or_mask(), the simplification done when (M & M') == 0 (replacing 'A & M' by 0) is just a special case and a repetition of the normal neutral-0 simplification which will done anyway (albeit later). Avoid the repetition by suppressing the special case. This also allow to be able to use this function in more situations. --- simplify.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/simplify.c b/simplify.c index 6a68ee5b4..2f30b1769 100644 --- a/simplify.c +++ b/simplify.c @@ -824,7 +824,7 @@ static int simplify_seteq_setne(struct instruction *insn, long long value) return 0; } -static int simplify_and_or_mask(struct instruction *insn, pseudo_t and, pseudo_t other, unsigned long long mask) +static int simplify_and_or_mask(pseudo_t and, unsigned long long mask) { struct instruction *def = and->def; unsigned long long omask, nmask; @@ -835,8 +835,6 @@ static int simplify_and_or_mask(struct instruction *insn, pseudo_t and, pseudo_t nmask = omask & mask; if (nmask == omask) return 0; - if (nmask == 0) - return replace_pseudo(insn, &insn->src1, other); def->src2 = value_pseudo(nmask); return REPEAT_CSE; } @@ -860,9 +858,9 @@ static int simplify_constant_mask(struct instruction *insn, unsigned long long m src1 = def->src1; src2 = def->src2; if (def_opcode(src1) == OP_AND) - return simplify_and_or_mask(insn, src1, src2, mask); + return simplify_and_or_mask(src1, mask); if (def_opcode(src2) == OP_AND) - return simplify_and_or_mask(insn, src2, src1, mask); + return simplify_and_or_mask(src2, mask); break; case OP_ZEXT: osize = def->orig_type->bit_size;