From patchwork Mon Mar 27 17:33:58 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: 9647237 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 3727E6034B for ; Mon, 27 Mar 2017 17:38:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2612A283FF for ; Mon, 27 Mar 2017 17:38:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1711A28419; Mon, 27 Mar 2017 17:38:30 +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 A8ACD28409 for ; Mon, 27 Mar 2017 17:38:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751396AbdC0Rha (ORCPT ); Mon, 27 Mar 2017 13:37:30 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36422 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751385AbdC0RhM (ORCPT ); Mon, 27 Mar 2017 13:37:12 -0400 Received: by mail-wr0-f194.google.com with SMTP id u1so15369233wra.3 for ; Mon, 27 Mar 2017 10:36:21 -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=T9Z0p73ZzZ7c6u3NO7wjtkHkrwLO5BqWEm2nTzYmDcU=; b=kGK0y8enYJ4xQco4RiGL3hNPT4abbrKXtzQH6C/x0JAnFtP1hDGQmttxnsA4s07HuP m6+69fgIbPnddsyYPVz94qX59qBFtDs3ZcAIYGkezqXzgX2ccs3Q4ppPUVFV3pg4xj7Q p6ROykdwOrNzZeE/e3Rf++nth5PeQBDXbXGv9RjLZWs/bVcJ8kOEa4iJdkNhAtK2Pa+R akGPRfHIt4XzUSEhayETrPg0cjr2cWFUj/ZDYomS4ew/smYAEd1mzMZnFQTkfZSyqhDk bDLGON1EDcowW+TGN2AiHByHwjfiFXjZuFJF+A+BhItXkiR5dVoqxlLzDiRUsXDbjh2e LEYw== 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=T9Z0p73ZzZ7c6u3NO7wjtkHkrwLO5BqWEm2nTzYmDcU=; b=FmkRtlcgyDzkkILw+O3rMelvGvYW+v4+hfuwZCQy9FOwZ3GBcJZVc+eAHmuyhNAp+I S16dRiDKT5JKxscVjc59qzJ9GfRfM8+WHDUPXVVCtSy89hxge0/lrAcnVsYp3iE815L3 +hT+9XFzftv1tmAXaXej0QSzEzkKuyLyoqHx//f2RruCfvJLAYJjzwzktpth+LXKett6 AUvRbgd9AU3HVm42V/ErZccHt3CEZekm18gbYe+9z9Xs+0n321Bmd3YlyuKsZpdjObCX fstZAGd+wcYaB/K+2Xyh8YsInY/k24wXo3WYyF/2Y3eYBQvy73UWbA2XwhVsHQllJCpC NAEA== X-Gm-Message-State: AFeK/H31vjrRefpEAP4BBUHwQB7A+aANLIfcBEdMW43rnvm+hmfc8MniH+Va6PojS156Fw== X-Received: by 10.28.175.129 with SMTP id y123mr10872788wme.67.1490636181083; Mon, 27 Mar 2017 10:36:21 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:802:b00:496:ae63:aebb:a034]) by smtp.gmail.com with ESMTPSA id e72sm304116wma.5.2017.03.27.10.36.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 10:36:20 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 08/15] inlined calls should not block BB packing Date: Mon, 27 Mar 2017 19:33:58 +0200 Message-Id: <20170327173405.11405-9-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170327173405.11405-1-luc.vanoostenryck@gmail.com> References: <20170327173405.11405-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 OP_INLINED_CALL are there only as a sort of annotation for debugging purpose. Their presence should thus not block the packing of basic blocks. Fix this by ignoring OP_INLINED_CALL when trying to pack a basic block. Signed-off-by: Luc Van Oostenryck --- flow.c | 1 + validation/call-inlined.c | 6 +----- validation/optim/call-inlined.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 validation/optim/call-inlined.c diff --git a/flow.c b/flow.c index c9259919f..04ef8cd1d 100644 --- a/flow.c +++ b/flow.c @@ -982,6 +982,7 @@ void pack_basic_blocks(struct entrypoint *ep) continue; switch (first->opcode) { case OP_NOP: case OP_LNOP: case OP_SNOP: + case OP_INLINED_CALL: continue; case OP_CBR: case OP_BR: { diff --git a/validation/call-inlined.c b/validation/call-inlined.c index 6fd94edcb..b907ded60 100644 --- a/validation/call-inlined.c +++ b/validation/call-inlined.c @@ -19,7 +19,7 @@ const char *qus(void) { return lstrip(messg); } /* * check-name: call-inlined - * check-command: test-linearize -Wno-decl $file + * check-command: test-linearize -Wno-decl -m64 $file * * check-output-start foo: @@ -27,14 +27,12 @@ foo: add.32 %r3 <- %arg1, %arg2 add.32 %r5 <- %r3, $1 - # call %r5 <- add, %r3, $1 ret.32 %r5 bar: .L3: - # call %r12 <- add, %r10, $1 ret @@ -42,7 +40,6 @@ bas: .L6: add.64 %r16 <- "abc", $1 - # call %r16 <- lstrip, %r14 ret.64 %r16 @@ -50,7 +47,6 @@ qus: .L9: add.64 %r21 <- messg, $1 - # call %r21 <- lstrip, %r19 ret.64 %r21 diff --git a/validation/optim/call-inlined.c b/validation/optim/call-inlined.c new file mode 100644 index 000000000..00698a4b1 --- /dev/null +++ b/validation/optim/call-inlined.c @@ -0,0 +1,30 @@ +static const char messg[] = "def"; + +static inline int add(int a, int b) +{ + return a + b; +} + +int foo(int a, int b, int p) +{ + if (p) { + add(a + b, 1); + return p; + } + return 0; +} + +/* + * check-name: call-inlined + * check-command: test-linearize -Wno-decl $file + * + * check-output-start +foo: +.L0: + + select.32 %r9 <- %arg3, %arg3, $0 + ret.32 %r9 + + + * check-output-end + */