From patchwork Tue Mar 21 00:15:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9635679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 33F95601E9 for ; Tue, 21 Mar 2017 00:16:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 267F426E4F for ; Tue, 21 Mar 2017 00:16:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B631271CB; Tue, 21 Mar 2017 00:16:44 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 6487D277D9 for ; Tue, 21 Mar 2017 00:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754163AbdCUAQX (ORCPT ); Mon, 20 Mar 2017 20:16:23 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35837 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754190AbdCUAQX (ORCPT ); Mon, 20 Mar 2017 20:16:23 -0400 Received: by mail-wr0-f196.google.com with SMTP id u108so20435059wrb.2 for ; Mon, 20 Mar 2017 17:16:22 -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=pvFGykPHXz0TNSFa5BAGyspWNnYkJ2aL3UdQ8cjdF+0=; b=ogjC/B4LVwxF4VyL+yTRDNLGCes2UFFwwWG5aJT2qweJc42Iqm2DCVzZX4mIZ8qRHm Bb7RObTQ47A9qNH8270nwTmp1Y5vCcK++EAjGyp5r8S2vOgFJzBvsuY7qumztEuWxCEE tEx1AEpEik1ATnc+P0dr1pSzbXgh3I0dpvGmv338pyF5sI8bkSdjX557huwYWSq6xIr7 v9S2m1Cv5b6Up8lGuBgkV5zO96H4VJ2AsW7z5iLixaSY413Lamnb+Q4ybuBBOfydaJ/Y Eid0U/FNl/diZd8/BzMBf/9GyzESoDCzOyEdl5ZaD9373Y6+0kxbYwqVoLJEslAlMnBN JF0w== 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=pvFGykPHXz0TNSFa5BAGyspWNnYkJ2aL3UdQ8cjdF+0=; b=JbX/PzSups8M524KKavJB/ec9te3NIY2OeVp//PElqPsM2Dg0bUvfH3l9gWc+16mug IXEjQTgCMZrTbTh9CCCR0TFmIg375Cgf/s8qSyNgdfBzFUi9lOxpVkN1DGPN3/ilJ6FE KTAh4g/oZRknzF0yqKP0XyQeBwlrv7CIrukgAQt9iyoM3OLrMyASpIG73nOAKp1AUUF3 wpSH/QkVksAnJ/VAbLpYyJbmJU836SFIkDavvsMNdtbGy5iM944UURoEmmOJrePm0eYE AkNZCWQjQcb+1Qr1Q7YYYUuXeL8l6TQ8+sTlojJVOzPcdnU3uFYmlxupBUYjbTnnwDKQ lFiw== X-Gm-Message-State: AFeK/H1EcaOJZZ/62ABdyDDEEpWssY6nRCxj7HRnv/duS4S5lXNNYl1jlOkkbsWjMfsCZQ== X-Received: by 10.223.130.214 with SMTP id 80mr28668433wrc.43.1490055381210; Mon, 20 Mar 2017 17:16:21 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:8b8:5c00:403a:a805:fd41:37d2]) by smtp.gmail.com with ESMTPSA id t195sm15271172wmt.32.2017.03.20.17.16.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 17:16:20 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Dibyendu Majumdar , Jeff Garzik , Pekka Enberg , Luc Van Oostenryck Subject: [PATCH v4 02/63] allow binop simplification after canonicalization Date: Tue, 21 Mar 2017 01:15:06 +0100 Message-Id: <20170321001607.75169-3-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170321001607.75169-1-luc.vanoostenryck@gmail.com> References: <20170321001607.75169-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 Signed-off-by: Luc Van Oostenryck --- simplify.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/simplify.c b/simplify.c index 5d00937f1..66035bbce 100644 --- a/simplify.c +++ b/simplify.c @@ -735,13 +735,13 @@ static int canonical_order(pseudo_t p1, pseudo_t p2) return 1; } -static int simplify_commutative_binop(struct instruction *insn) +static int canonicalize_commutative(struct instruction *insn) { - if (!canonical_order(insn->src1, insn->src2)) { - switch_pseudo(insn, &insn->src1, insn, &insn->src2); - return REPEAT_CSE; - } - return 0; + if (canonical_order(insn->src1, insn->src2)) + return 0; + + switch_pseudo(insn, &insn->src1, insn, &insn->src2); + return repeat_phase |= REPEAT_CSE; } static inline int simple_pseudo(pseudo_t pseudo) @@ -1129,17 +1129,15 @@ int simplify_instruction(struct instruction *insn) case OP_ADD: case OP_MULS: case OP_AND: case OP_OR: case OP_XOR: case OP_AND_BOOL: case OP_OR_BOOL: + canonicalize_commutative(insn); if (simplify_binop(insn)) return REPEAT_CSE; - if (simplify_commutative_binop(insn)) - return REPEAT_CSE; return simplify_associative_binop(insn); case OP_MULU: case OP_SET_EQ: case OP_SET_NE: - if (simplify_binop(insn)) - return REPEAT_CSE; - return simplify_commutative_binop(insn); + canonicalize_commutative(insn); + return simplify_binop(insn); case OP_SUB: case OP_DIVU: case OP_DIVS: