From patchwork Fri Sep 22 11:37:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Cheng X-Patchwork-Id: 817442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-462773-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="GF3LJXQT"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xzBLX0fWSz9sNw for ; Fri, 22 Sep 2017 21:38:11 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:content-type:mime-version; q=dns; s=default; b=wK4q6VZN5oBTl4xz5nKfrNyAaxEuCG3Ar8G+tiYRnkyZx544YC ekF3xsRUDfx5fQD0BH/7BD/7/lKsR2acFykmRFaCuJ/dIpc7tXDKgmovwe+tV6RY JNpqe96oMj+5tW4/ztPkGPvycZ+IwOMS1SWBuTduwLIY79NVxEWDGvACI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:content-type:mime-version; s= default; bh=P+HEaIOep5Tty6VeawFfvz6wgjg=; b=GF3LJXQTTrSh+jjMJFx3 kzqxdFoOTh0KE76YTl4wyoHmST4b2b2FNaTtTudOGHfc/MwYybemk+CKtB0VQsjW Pk4sm8GqD4vJOFR21BxRJBnhaz3kdEMoqFyO5tOtcYFvN2mwKCn8gtzazOUESFZK 7wB1ggByUKEMIW+noNBSLAU= Received: (qmail 115202 invoked by alias); 22 Sep 2017 11:38:01 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 114833 invoked by uid 89); 22 Sep 2017 11:38:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=H*c:sk:HHHPRHH, 2813 X-HELO: EUR02-AM5-obe.outbound.protection.outlook.com Received: from mail-eopbgr00082.outbound.protection.outlook.com (HELO EUR02-AM5-obe.outbound.protection.outlook.com) (40.107.0.82) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 22 Sep 2017 11:37:58 +0000 Received: from DB5PR0801MB2742.eurprd08.prod.outlook.com (10.166.176.26) by DB5PR0801MB2744.eurprd08.prod.outlook.com (10.166.176.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 22 Sep 2017 11:37:54 +0000 Received: from DB5PR0801MB2742.eurprd08.prod.outlook.com ([10.166.176.26]) by DB5PR0801MB2742.eurprd08.prod.outlook.com ([10.166.176.26]) with mapi id 15.20.0077.011; Fri, 22 Sep 2017 11:37:53 +0000 From: Bin Cheng To: "gcc-patches@gcc.gnu.org" CC: nd Subject: [PATCH PR82163/V2]New interface checking LCSSA for single loop Date: Fri, 22 Sep 2017 11:37:53 +0000 Message-ID: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Bin.Cheng@arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB5PR0801MB2744; 6:p2y5dohqRyc2Z69TNMeefRqhYTuvd+eT+T5BiFfejpWus/546XcPhE5h9nQyVLwTR84lvifxGghunOeSTUf7XD5zDCvSucfPz18jbOuI61Dg8FSm9cPzK4iltUQmNMeo9RZUbUaOHxskcTnpxL/5xjVH8zJJkDw3qvQYUOTcwWddGWR5mqeZzHEBG/lKRiK16lekPwiYyniYjrYOX0jKl7aT/r/nvwBhjIaMnjNivmB9i9E1EKz8St+IbSCByb6Rb3UC69CKMBOqaXDKesLXO+gOT1Seby5EKdMvnmqCI+nIKjKRMqu67WbEMoypcoYCxG3x0ffijE6gl1Z/jfbBbg==; 5:CpXzX1oH1zzRP5bxvtzrSp33jr2UotQttgIsDyg0XwqgO8Qfh0DIkZrLu6llYp9rej6AZclZiM7HJk+KL+BHeSaaR46cFKp0dxR9YMpFSRGUdlN8NEmVJYjpIyc0vLNOcUiQYnu7Zas5dkSTVEns+Q==; 24:NaZU0aNdYNPYLYDh5DPHvDxwfUTSCLpubcke8rPnSJh06JaoY4PVeK1mzehr+4bk568dFsjbO9bugEojLNHwiuWAYwlm1OcD/ZQbb5e53WM=; 7:5XIHpVAZFShuvA+6+FhKkFgzoZvdJ/qujgMeUMo1R2crdl1weZaWbfr2Ua2ybEcNTdKJGo8S66mG+Hej+utstsqBkGp4j/Ehi2KrmJ6PDu6LpW+9JgNvKP61iV0CMDig+MX3lGB5gv7EWt19XBPWMZCCnfSJu9suXKfGFiRaxn9QgW2t8rFMUitVJB5Z2t1ZUdtPfNNP3rktqi6a2HJkT69kLtMzBWpDAwOICM2kw44= x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: c595b103-f793-4bbd-f188-08d501ae5cc9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(2017052603199)(49563074)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DB5PR0801MB2744; x-ms-traffictypediagnostic: DB5PR0801MB2744: nodisclaimer: True x-exchange-antispam-report-test: UriScan:(180628864354917)(17755550239193); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(102415395)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123560025)(20161123558100)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DB5PR0801MB2744; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DB5PR0801MB2744; x-forefront-prvs: 0438F90F17 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(199003)(189002)(377424004)(53936002)(106356001)(33656002)(3280700002)(6916009)(2351001)(9686003)(101416001)(55016002)(54356999)(105586002)(2900100001)(99936001)(2501003)(102836003)(50986999)(99286003)(6116002)(2906002)(68736007)(5660300001)(3846002)(25786009)(72206003)(81166006)(97736004)(14454004)(3660700001)(189998001)(6436002)(5640700003)(7696004)(6506006)(74316002)(7736002)(77096006)(66066001)(86362001)(8676002)(478600001)(316002)(4326008)(305945005)(8936002)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR0801MB2744; H:DB5PR0801MB2742.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Sep 2017 11:37:53.4218 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR0801MB2744 X-IsSubscribed: yes Hi, This is the V2 patch fixing PR82163. It rewrites verify_loop_closed_ssa by checking uses of all definitions inside of loop. This gives advantage that we can check loop closed ssa form for a specific loop, rather than for whole function. The interface is used in fixing this issue. Bootstrap and test on x86_64, is it OK? Thanks, bin 2017-09-21 Bin Cheng PR tree-optimization/82163 * tree-ssa-loop-manip.h (verify_loop_closed_ssa): New parameter. (checking_verify_loop_closed_ssa): New parameter. * tree-ssa-loop-manip.c (check_loop_closed_ssa_use): Delete. (check_loop_closed_ssa_stmt): Delete. (check_loop_closed_ssa_def, check_loop_closed_ssa_bb): New functions. (verify_loop_closed_ssa): Check loop closed ssa form for LOOP. (tree_transform_and_unroll_loop): Check loop closed ssa form only for changed loops. gcc/testsuite 2017-09-21 Bin Cheng PR tree-optimization/82163 * gcc.dg/tree-ssa/pr82163.c: New test. From ef756285db3685bd97bbe7d144d58af477251416 Mon Sep 17 00:00:00 2001 From: Bin Cheng Date: Thu, 21 Sep 2017 12:41:32 +0100 Subject: [PATCH] pr82163-20170921.txt --- gcc/testsuite/gcc.dg/tree-ssa/pr82163.c | 23 +++++++++ gcc/tree-ssa-loop-manip.c | 91 +++++++++++++++++++-------------- gcc/tree-ssa-loop-manip.h | 6 +-- 3 files changed, 80 insertions(+), 40 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr82163.c diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr82163.c b/gcc/testsuite/gcc.dg/tree-ssa/pr82163.c new file mode 100644 index 0000000..fef2b1d --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr82163.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +int a, b, c[4], d, e, f, g; + +void h () +{ + for (; a; a++) + { + c[a + 3] = g; + if (b) + c[a] = f; + else + { + for (; d; d++) + c[d + 3] = c[d]; + for (e = 1; e == 2; e++) + ; + if (e) + break; + } + } +} diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c index d6ba305..6ad0b75 100644 --- a/gcc/tree-ssa-loop-manip.c +++ b/gcc/tree-ssa-loop-manip.c @@ -690,48 +690,62 @@ rewrite_virtuals_into_loop_closed_ssa (struct loop *loop) rewrite_into_loop_closed_ssa_1 (NULL, 0, SSA_OP_VIRTUAL_USES, loop); } -/* Check invariants of the loop closed ssa form for the USE in BB. */ +/* Check invariants of the loop closed ssa form for the def in DEF_BB. */ static void -check_loop_closed_ssa_use (basic_block bb, tree use) +check_loop_closed_ssa_def (basic_block def_bb, tree def) { - gimple *def; - basic_block def_bb; + use_operand_p use_p; + imm_use_iterator iterator; + FOR_EACH_IMM_USE_FAST (use_p, iterator, def) + { + if (is_gimple_debug (USE_STMT (use_p))) + continue; - if (TREE_CODE (use) != SSA_NAME || virtual_operand_p (use)) - return; + basic_block use_bb = gimple_bb (USE_STMT (use_p)); + if (is_a (USE_STMT (use_p))) + use_bb = EDGE_PRED (use_bb, PHI_ARG_INDEX_FROM_USE (use_p))->src; - def = SSA_NAME_DEF_STMT (use); - def_bb = gimple_bb (def); - gcc_assert (!def_bb - || flow_bb_inside_loop_p (def_bb->loop_father, bb)); + gcc_assert (flow_bb_inside_loop_p (def_bb->loop_father, use_bb)); + } } -/* Checks invariants of loop closed ssa form in statement STMT in BB. */ +/* Checks invariants of loop closed ssa form in BB. */ static void -check_loop_closed_ssa_stmt (basic_block bb, gimple *stmt) +check_loop_closed_ssa_bb (basic_block bb) { - ssa_op_iter iter; - tree var; + for (gphi_iterator bsi = gsi_start_phis (bb); !gsi_end_p (bsi); + gsi_next (&bsi)) + { + gphi *phi = bsi.phi (); - if (is_gimple_debug (stmt)) - return; + if (!virtual_operand_p (PHI_RESULT (phi))) + check_loop_closed_ssa_def (bb, PHI_RESULT (phi)); + } + + for (gimple_stmt_iterator bsi = gsi_start_bb (bb); !gsi_end_p (bsi); + gsi_next (&bsi)) + { + ssa_op_iter iter; + tree var; + gimple *stmt = gsi_stmt (bsi); + + if (is_gimple_debug (stmt)) + continue; - FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter, SSA_OP_USE) - check_loop_closed_ssa_use (bb, var); + FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter, SSA_OP_DEF) + check_loop_closed_ssa_def (bb, var); + } } /* Checks that invariants of the loop closed ssa form are preserved. - Call verify_ssa when VERIFY_SSA_P is true. */ + Call verify_ssa when VERIFY_SSA_P is true. Note all loops are checked + if LOOP is NULL, otherwise, only LOOP is checked. */ DEBUG_FUNCTION void -verify_loop_closed_ssa (bool verify_ssa_p) +verify_loop_closed_ssa (bool verify_ssa_p, struct loop *loop) { - basic_block bb; - edge e; - edge_iterator ei; - if (number_of_loops (cfun) <= 1) return; @@ -740,20 +754,22 @@ verify_loop_closed_ssa (bool verify_ssa_p) timevar_push (TV_VERIFY_LOOP_CLOSED); - FOR_EACH_BB_FN (bb, cfun) + if (loop == NULL) { - for (gphi_iterator bsi = gsi_start_phis (bb); !gsi_end_p (bsi); - gsi_next (&bsi)) - { - gphi *phi = bsi.phi (); - FOR_EACH_EDGE (e, ei, bb->preds) - check_loop_closed_ssa_use (e->src, - PHI_ARG_DEF_FROM_EDGE (phi, e)); - } + basic_block bb; - for (gimple_stmt_iterator bsi = gsi_start_bb (bb); !gsi_end_p (bsi); - gsi_next (&bsi)) - check_loop_closed_ssa_stmt (bb, gsi_stmt (bsi)); + FOR_EACH_BB_FN (bb, cfun) + if (bb->loop_father && bb->loop_father->num > 0) + check_loop_closed_ssa_bb (bb); + } + else + { + basic_block *bbs = get_loop_body (loop); + + for (unsigned i = 0; i < loop->num_nodes; ++i) + check_loop_closed_ssa_bb (bbs[i]); + + free (bbs); } timevar_pop (TV_VERIFY_LOOP_CLOSED); @@ -1405,7 +1421,8 @@ tree_transform_and_unroll_loop (struct loop *loop, unsigned factor, checking_verify_flow_info (); checking_verify_loop_structure (); - checking_verify_loop_closed_ssa (true); + checking_verify_loop_closed_ssa (true, loop); + checking_verify_loop_closed_ssa (true, new_loop); } /* Wrapper over tree_transform_and_unroll_loop for case we do not diff --git a/gcc/tree-ssa-loop-manip.h b/gcc/tree-ssa-loop-manip.h index a139050..3f5b3ee 100644 --- a/gcc/tree-ssa-loop-manip.h +++ b/gcc/tree-ssa-loop-manip.h @@ -28,13 +28,13 @@ extern void rewrite_into_loop_closed_ssa_1 (bitmap, unsigned, int, struct loop *); extern void rewrite_into_loop_closed_ssa (bitmap, unsigned); extern void rewrite_virtuals_into_loop_closed_ssa (struct loop *); -extern void verify_loop_closed_ssa (bool); +extern void verify_loop_closed_ssa (bool, struct loop * = NULL); static inline void -checking_verify_loop_closed_ssa (bool verify_ssa_p) +checking_verify_loop_closed_ssa (bool verify_ssa_p, struct loop *loop = NULL) { if (flag_checking) - verify_loop_closed_ssa (verify_ssa_p); + verify_loop_closed_ssa (verify_ssa_p, loop); } extern basic_block split_loop_exit_edge (edge);