From patchwork Sat Jul 21 21:16:38 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: 10539047 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 CC638A6AD for ; Sun, 22 Jul 2018 00:57:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4732C28CC4 for ; Sat, 21 Jul 2018 21:17:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B7B228CC7; Sat, 21 Jul 2018 21:17:07 +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 1F73E28CC4 for ; Sat, 21 Jul 2018 21:17:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728145AbeGUWLM (ORCPT ); Sat, 21 Jul 2018 18:11:12 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:32836 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728130AbeGUWLM (ORCPT ); Sat, 21 Jul 2018 18:11:12 -0400 Received: by mail-ed1-f65.google.com with SMTP id x5-v6so12473839edr.0 for ; Sat, 21 Jul 2018 14:17:04 -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=Z69nrfXTt750NZCQkggiQjBxmb3kjaCp3OH1Fb7/NRs=; b=NgF5lCujjxHepqTwcxXbeEtma0EeeeDM50/go/Lqy5IH1S3D0+QqXTWF7vNLshRkl6 1oxUhhr+tO4zZLg4CorU6GQ2FBd7C3yhzEY/buSkBKAkddPoY90//Yl+6+gXxd4Erk5h k/O0sWhfbmF6rFzmowQkEw0sHClSn488Vay0BfX74UKyP+fgSFsWeXgcliHZTKYjP9Yv Mf+rcsyALN88pajqv2k65rPLUpYWKFn86zdwDI08w1RT2KI+NVz2VsBFIkZvC9IGWv04 HzrnKrX4Lc/rFyXE6zi2CrYMBkTLK4z7nhl32n7aQzDyXLXN8w9ysOcf7sCNbuK9CaUl 2mbA== 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=Z69nrfXTt750NZCQkggiQjBxmb3kjaCp3OH1Fb7/NRs=; b=Pq5aAFgdf29vcdNsnBMfmDjFDrIAzSG0Kj/Unoo4fC5S1+91L81n0oohPcB/H7bcZE TBDH3KfDkFd2grGtwHy09FtO4GXT25nHBWIUSl4GXHP4dZ0kPvuNbV7mDH394D/MvENW vjSfikmGFAM60Z298SRzpNV/EtUj2BdPx4lhrppLCk2BNlnc7qwF78bAytUkzyY5ycyH XwwD/HBUMKnIF743o80L7oiQ/rUhiDkAdXMRWzVG2ztED395KxepqwApPnnSfp2NpbDs xTs14tB2FfJcb1Ceb5w2RIZXQa8x/Evkuk2O6Uv0mrIvbqXdo3k+IGC8w2csdovPwiuY 1z3w== X-Gm-Message-State: AOUpUlGgX6BdhcHa4v1GV8dnq8sabCK9egpshWVMDMFcijj2IWHhpRJi HRfaIapZ/FtC/05PdBiUq/EwjIcF X-Google-Smtp-Source: AAOMgpcehYDsXNiv3N8nJD0s7FdvI+isk2Sodwiu2056J5unVYnfKr6JlroYtURMtSWeQqMoV48M4w== X-Received: by 2002:a50:b2c6:: with SMTP id p64-v6mr7661265edd.293.1532207823751; Sat, 21 Jul 2018 14:17:03 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4056:df00:2c15:f8b2:e0d5:934c]) by smtp.gmail.com with ESMTPSA id y12-v6sm2636768edq.55.2018.07.21.14.17.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 14:17:03 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH 01/16] extract nbr_users() from unssa.c Date: Sat, 21 Jul 2018 23:16:38 +0200 Message-Id: <20180721211653.72853-2-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721211653.72853-1-luc.vanoostenryck@gmail.com> References: <20180721211653.72853-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 small helper was used in unssa.c but is useful elsewhere too. Move it as an inline function to linearize.h and rename it to 'nbr_users()' since it is close to the existing 'has_users()'. Signed-off-by: Luc Van Oostenryck --- linearize.h | 5 +++++ simplify.c | 2 +- unssa.c | 7 +------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linearize.h b/linearize.h index 092e1ac23..2bd6185a6 100644 --- a/linearize.h +++ b/linearize.h @@ -338,6 +338,11 @@ static inline int has_users(pseudo_t p) return pseudo_user_list_size(p->users) != 0; } +static inline int nbr_users(pseudo_t p) +{ + return pseudo_user_list_size(p->users); +} + static inline struct pseudo_user *alloc_pseudo_user(struct instruction *insn, pseudo_t *pp) { struct pseudo_user *user = __alloc_pseudo_user(0); diff --git a/simplify.c b/simplify.c index 3a5ae9331..1ac000e52 100644 --- a/simplify.c +++ b/simplify.c @@ -843,7 +843,7 @@ static int simplify_associative_binop(struct instruction *insn) return 0; if (!simple_pseudo(def->src2)) return 0; - if (pseudo_user_list_size(def->target->users) != 1) + if (nbr_users(def->target) != 1) return 0; switch_pseudo(def, &def->src1, insn, &insn->src2); return REPEAT_CSE; diff --git a/unssa.c b/unssa.c index e7c9154d5..334ffa470 100644 --- a/unssa.c +++ b/unssa.c @@ -34,11 +34,6 @@ #include -static inline int nbr_pseudo_users(pseudo_t p) -{ - return ptr_list_size((struct ptr_list *)p->users); -} - static int simplify_phi_node(struct instruction *phi, pseudo_t tmp) { pseudo_t target = phi->target; @@ -95,7 +90,7 @@ static void replace_phi_node(struct instruction *phi) src = def->phi_src; if (src->type != PSEUDO_REG) continue; - switch (nbr_pseudo_users(src)) { + switch (nbr_users(src)) { struct instruction *insn; case 1: insn = src->def;