From patchwork Sun Aug 9 08:30:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Dudka X-Patchwork-Id: 40219 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n798SQRK003493 for ; Sun, 9 Aug 2009 08:30:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752691AbZHIIa5 (ORCPT ); Sun, 9 Aug 2009 04:30:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752388AbZHIIa4 (ORCPT ); Sun, 9 Aug 2009 04:30:56 -0400 Received: from mx2.redhat.com ([66.187.237.31]:44987 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751536AbZHIIaz (ORCPT ); Sun, 9 Aug 2009 04:30:55 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n798Uuuw028149 for ; Sun, 9 Aug 2009 04:30:56 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n798Utc2004825 for ; Sun, 9 Aug 2009 04:30:55 -0400 Received: from vpn2-8-75.ams2.redhat.com (vpn2-8-75.ams2.redhat.com [10.36.8.75]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n798Us5i030383 for ; Sun, 9 Aug 2009 04:30:55 -0400 From: Kamil Dudka To: sparse Subject: [PATCH] unssa: track uses when replacing a phi node Date: Sun, 9 Aug 2009 10:30:23 +0200 User-Agent: KMail/1.9.7 MIME-Version: 1.0 X-Length: 4766 X-UID: 38517 Message-Id: <200908091030.24138.kdudka@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org Hello, attached are patch, testing input for test-unssa and its outputs before patch and after patch. Thanks in advance for considering the patch! Kamil test: .L0x7f9fb2030010 phisrc.32 %phi2(ptr) <- %arg1 br .L0x7f9fb2030130 .L0x7f9fb2030130 copy.32 %r1(ptr) <- %r5(ptr) br %r1(ptr), .L0x7f9fb2030058, .L0x7f9fb20300e8 .L0x7f9fb2030058 load.32 %r3 <- 0[%r1(ptr)] phisrc.32 %phi3(ptr) <- %r3 br .L0x7f9fb2030130 .L0x7f9fb20300e8 ret test: .L0x7f4a7f7f1010 copy.32 %r5(ptr) <- %arg1 br .L0x7f4a7f7f1130 .L0x7f4a7f7f1130 copy.32 %r1(ptr) <- %r5(ptr) br %r1(ptr), .L0x7f4a7f7f1058, .L0x7f4a7f7f10e8 .L0x7f4a7f7f1058 load.32 %r3 <- 0[%r1(ptr)] copy.32 %r5(ptr) <- %r3 br .L0x7f4a7f7f1130 .L0x7f4a7f7f10e8 ret From 66a02fa7cec780fc88d6ef4cce7a1e704928808a Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sun, 9 Aug 2009 10:22:11 +0200 Subject: [PATCH] unssa: track uses when replacing a phi node The output of test-unssa is inconsistent for a simple test-case without this patch: static void test(void **ptr) { while (ptr) { ptr = *ptr; } } Signed-off-by: Kamil Dudka --- flow.h | 1 + liveness.c | 2 +- unssa.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/flow.h b/flow.h index 9f2e165..fbc9505 100644 --- a/flow.h +++ b/flow.h @@ -29,6 +29,7 @@ int dominates(pseudo_t pseudo, struct instruction *insn, struct instruction *dom extern void clear_liveness(struct entrypoint *ep); extern void track_pseudo_liveness(struct entrypoint *ep); extern void track_pseudo_death(struct entrypoint *ep); +extern void track_phi_uses(struct instruction *insn); extern void vrfy_flow(struct entrypoint *ep); extern int pseudo_in_list(struct pseudo_list *list, pseudo_t pseudo); diff --git a/liveness.c b/liveness.c index 8b0dfd8..eeff0f7 100644 --- a/liveness.c +++ b/liveness.c @@ -279,7 +279,7 @@ static void merge_pseudo_list(struct pseudo_list *src, struct pseudo_list **dest } END_FOR_EACH_PTR(pseudo); } -static void track_phi_uses(struct instruction *insn) +void track_phi_uses(struct instruction *insn) { pseudo_t phi; FOR_EACH_PTR(insn->phi_list, phi) { diff --git a/unssa.c b/unssa.c index cd18313..3eea9b2 100644 --- a/unssa.c +++ b/unssa.c @@ -26,6 +26,7 @@ #include "lib.h" #include "linearize.h" #include "allocate.h" +#include "flow.h" #include @@ -51,6 +52,7 @@ static void replace_phi_node(struct instruction *phi) // update the current liveness remove_pseudo(&phi->bb->needs, phi->target); add_pseudo(&phi->bb->needs, tmp); + track_phi_uses(phi); phi->opcode = OP_COPY; phi->src = tmp; -- 1.6.4