From patchwork Wed Aug 9 19:38:04 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: 9891733 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 1F68A602D7 for ; Wed, 9 Aug 2017 19:39:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 116E62832D for ; Wed, 9 Aug 2017 19:39:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0666D28672; Wed, 9 Aug 2017 19:39:09 +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 A544F2832D for ; Wed, 9 Aug 2017 19:39:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751940AbdHITjI (ORCPT ); Wed, 9 Aug 2017 15:39:08 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33418 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751884AbdHITjH (ORCPT ); Wed, 9 Aug 2017 15:39:07 -0400 Received: by mail-wm0-f68.google.com with SMTP id q189so631246wmd.0 for ; Wed, 09 Aug 2017 12:39:06 -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=K2Z1cIY1ehAO7o1HADEO9DSoqrQrreLUbeCp7aJfJbw=; b=nLbVEBOOuke5xNaNsKD2ezbbx7Oaln+QGH3TtiW2/fUdwYTERZRfVzav50BqzEHK3o OYnTioOBKrX9xKSKETzOsQ65NG68m0BFxvC+Xcbv3rVuBl17EJBtjN8092hcTnWqtPpr 8f4gAe4cWx9Oqj241Lj3lb1BdT2J4rJ7ZzKgo2vxEImiOuv8KCuNzcKwWd5IAK5Wz45Z SNFcWtA4uTOOkia0p3q2y0XMkAKi5+HUNIeZSSbaDJ6PN9rIbJv8n/wUguwRqj3737zm kzbTOgU39ADKn+cYRkg6tNgsytq8wrsL8NmfBnidBObM+IzXiybKArTBlBzznH5mqpA9 vhFw== 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=K2Z1cIY1ehAO7o1HADEO9DSoqrQrreLUbeCp7aJfJbw=; b=VNGcx+VErDa0ErwqZU/fcthnInkpNpmEjsP4mFem7shIfkPsD6ZCEe5BtqU3m4+k6R fIu8TZZ0iuYp0zJGgmPamLr5EYCi8IuX9BXNZ6CZeS1JiI1186z5IEpkPLWB75acILYN jGI9skGj3dkfEaqNnr1p3Y1Mop7veMshfMsVwsc7FFkz1LDvQCNulwVwR+FPKdeBuBzW plxMafZr9/YAOnlqdV16HP/kh24IBU/3NvBeL6O4bfmoeBqkLes7ERpCDA8sbJeq+kHk A1QXqAhdjEWvBfqV04fdAir8csoHfl/6PB6Yf3FBUSlp8BV2zSsrxMt9Z4uiXETWVE4p 3ZkA== X-Gm-Message-State: AHYfb5gR+ssbLhMQt96uLXtUswk+t/v71WlWmCWvXgCBUTB83rc4Sgy2 I2I6XFoxOyswod9B5po= X-Received: by 10.80.218.195 with SMTP id s3mr8971116edj.216.1502307545742; Wed, 09 Aug 2017 12:39:05 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4076:600:a54f:2a42:70ce:5bd2]) by smtp.gmail.com with ESMTPSA id t36sm2984437edb.38.2017.08.09.12.39.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Aug 2017 12:39:05 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v4 7/9] transform (A & M) >> S to (A >> S) & (M >> S) Date: Wed, 9 Aug 2017 21:38:04 +0200 Message-Id: <20170809193806.30975-8-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170809193806.30975-1-luc.vanoostenryck@gmail.com> References: <20170809193806.30975-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 This is especially usefull when simplifying code accessing bitfields. Signed-off-by: Luc Van Oostenryck --- simplify.c | 29 ++++++++++++++++++++++++++++- validation/bitfield-size.c | 4 +--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/simplify.c b/simplify.c index 40d4f0068..e8bf1c171 100644 --- a/simplify.c +++ b/simplify.c @@ -411,6 +411,32 @@ static int simplify_asr(struct instruction *insn, pseudo_t pseudo, long long val return 0; } +static int simplify_lsr(struct instruction *insn, pseudo_t pseudo, long long value) +{ + struct instruction *def; + unsigned long long mask; + + if (!value) + return replace_with_pseudo(insn, pseudo); + switch (def_opcode(insn->src1)) { + case OP_AND: + // replace (A & M) >> S + // by (A >> S) & (M >> S) + def = insn->src1->def; + if (!constant(def->src2)) + break; + if (nbr_pseudo_users(insn->src1) > 1) + break; + mask = def->src2->value; + def->opcode = OP_LSR; + def->src2 = value_pseudo(value); + insn->opcode = OP_AND; + insn->src2 = value_pseudo(mask >> value); + return REPEAT_CSE; + } + return 0; +} + static int simplify_mul_div(struct instruction *insn, long long value) { unsigned long long sbit = 1ULL << (insn->size - 1); @@ -561,13 +587,14 @@ static int simplify_constant_rightside(struct instruction *insn) case OP_ADD: case OP_OR: case OP_XOR: case OP_SHL: - case OP_LSR: case_neutral_zero: if (!value) return replace_with_pseudo(insn, insn->src1); return 0; case OP_ASR: return simplify_asr(insn, insn->src1, value); + case OP_LSR: + return simplify_lsr(insn, insn->src1, value); case OP_MODU: case OP_MODS: if (value == 1) diff --git a/validation/bitfield-size.c b/validation/bitfield-size.c index c8c94bb15..34400479a 100644 --- a/validation/bitfield-size.c +++ b/validation/bitfield-size.c @@ -36,8 +36,6 @@ unsigned int get_pbfi_b(struct bfi *bf) { return bf->b; } * check-output-ignore * * check-output-excludes: cast\\.4 - * check-output-pattern-6-times: cast\\. * check-output-pattern-6-times: lsr\\..*\\$6 - * check-output-pattern-6-times: and\\..*\\$15 - * check-output-pattern-6-times: and\\..*\\$960 + * check-output-pattern-12-times: and\\..*\\$15 */