From patchwork Wed Apr 6 08:53:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prathamesh Kulkarni X-Patchwork-Id: 65154 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp919087lbc; Wed, 6 Apr 2016 01:53:57 -0700 (PDT) X-Received: by 10.98.73.142 with SMTP id r14mr36834394pfi.140.1459932837689; Wed, 06 Apr 2016 01:53:57 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id 133si3219496pfb.209.2016.04.06.01.53.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2016 01:53:57 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-424435-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-424435-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-424435-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=ZBuh/J3SPyqt4FltjB NlzZMct/ibDsobjYkk1EH6Kt5nKMnsS0+wQ/FtULk+1ZlWJ4JzMEAkbWjJoZ8zb/ N5eKoyh/HcKvpByfLd0xFFN9pnmMZp/CiPpXrF6pnU67ZFDxhoJHBdHxynhvPs5k 8pOErir9GOPlBJjdBp/7DPBcU= 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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=FtJAkb2Gg/dpgYRNwZGKERfA BVU=; b=qZd9wHPvjCdArkuqtUO9n5C82LZ48FhhqSDxpn7YPkq/UdGWNb0hwMxB kDbhnvRra5er8jzjhS+vAPv7AB72mhyGJQY05ymZ9CVb15Dj+TFslZzov9QVszeD CvPKRIIdQb1dd5fXUigiTtOC+6VoS3kdMwL962hW+IAST4BC6s4= Received: (qmail 103058 invoked by alias); 6 Apr 2016 08:53:38 -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 103040 invoked by uid 89); 6 Apr 2016 08:53:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=million, expenses, ten, late X-HELO: mail-ig0-f182.google.com Received: from mail-ig0-f182.google.com (HELO mail-ig0-f182.google.com) (209.85.213.182) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 06 Apr 2016 08:53:27 +0000 Received: by mail-ig0-f182.google.com with SMTP id gy3so81729715igb.1 for ; Wed, 06 Apr 2016 01:53:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=w0DJCfZNo3n2aTgesiqd5dZBAGfXRuckfsBhTrDqgSY=; b=EWAszNFEJZzDaCAAjwtCP9DYKHU98NdWKgCosxid4dUCDqt+NT70lihcZh9N/MUYOd BmcLoPT/bP5MO+/UBIXVp57IZz5WSLClcs/bFcDXfqWdFJTnKP0fe1YF9XVBSx5K8DUR HPC0S1zGswC0dtIDQRqTARLcu3aI15iPiwSNwtH595Od3IY+0N1Ghud44GUliXAv52GS tB+u6cXpfcFDc4qpkanX5R3AfH1TEhJ7zoImtRofiP/IG3Ro+pqXw7UDKIty5kli7ztQ 5VHoK9yyU44pPejv6i9i3Ve4ttgfSHhT/oIvxcH8AnlL2+3TJ/N6xiWu848vqzmN1lFo exBA== X-Gm-Message-State: AD7BkJJiv15OMGIoImOn45wcv8v9APpweU8AYAzE96guEzI3HexRh5zTupXMSifcP8iq1rRJkAXp1kxl8wRaE9UC MIME-Version: 1.0 X-Received: by 10.50.59.146 with SMTP id z18mr21552802igq.62.1459932804933; Wed, 06 Apr 2016 01:53:24 -0700 (PDT) Received: by 10.36.196.5 with HTTP; Wed, 6 Apr 2016 01:53:24 -0700 (PDT) In-Reply-To: References: <20160404120030.GD14122@kam.mff.cuni.cz> <20160404141436.GB95176@kam.mff.cuni.cz> Date: Wed, 6 Apr 2016 14:23:24 +0530 Message-ID: Subject: Re: [RFC] introduce --param max-lto-partition for having an upper bound on partition size From: Prathamesh Kulkarni To: Richard Biener Cc: Jan Hubicka , gcc Patches , Ramana Radhakrishnan X-IsSubscribed: yes On 6 April 2016 at 13:44, Richard Biener wrote: > On Wed, 6 Apr 2016, Prathamesh Kulkarni wrote: > >> On 5 April 2016 at 18:28, Richard Biener wrote: >> > On Tue, 5 Apr 2016, Prathamesh Kulkarni wrote: >> > >> >> On 5 April 2016 at 16:58, Richard Biener wrote: >> >> > On Tue, 5 Apr 2016, Prathamesh Kulkarni wrote: >> >> > >> >> >> On 4 April 2016 at 19:44, Jan Hubicka wrote: >> >> >> > >> >> >> >> diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c >> >> >> >> index 9eb63c2..bc0c612 100644 >> >> >> >> --- a/gcc/lto/lto-partition.c >> >> >> >> +++ b/gcc/lto/lto-partition.c >> >> >> >> @@ -511,9 +511,20 @@ lto_balanced_map (int n_lto_partitions) >> >> >> >> varpool_order.qsort (varpool_node_cmp); >> >> >> >> >> >> >> >> /* Compute partition size and create the first partition. */ >> >> >> >> + if (PARAM_VALUE (MIN_PARTITION_SIZE) > PARAM_VALUE (MAX_PARTITION_SIZE)) >> >> >> >> + fatal_error (input_location, "min partition size cannot be greater than max partition size"); >> >> >> >> + >> >> >> >> partition_size = total_size / n_lto_partitions; >> >> >> >> if (partition_size < PARAM_VALUE (MIN_PARTITION_SIZE)) >> >> >> >> partition_size = PARAM_VALUE (MIN_PARTITION_SIZE); >> >> >> >> + else if (partition_size > PARAM_VALUE (MAX_PARTITION_SIZE)) >> >> >> >> + { >> >> >> >> + n_lto_partitions = total_size / PARAM_VALUE (MAX_PARTITION_SIZE); >> >> >> >> + if (total_size % PARAM_VALUE (MAX_PARTITION_SIZE)) >> >> >> >> + n_lto_partitions++; >> >> >> >> + partition_size = total_size / n_lto_partitions; >> >> >> >> + } >> >> >> > >> >> >> > lto_balanced_map actually works in a way that looks for cheapest cutpoint in range >> >> >> > 3/4*parittion_size to 2*partition_size and picks the cheapest range. >> >> >> > Setting partition_size to this value will thus not cause partitioner to produce smaller >> >> >> > partitions only. I suppose modify the conditional: >> >> >> > >> >> >> > /* Partition is too large, unwind into step when best cost was reached and >> >> >> > start new partition. */ >> >> >> > if (partition->insns > 2 * partition_size) >> >> >> > >> >> >> > and/or in the code above set the partition_size to half of total_size/max_size. >> >> >> > >> >> >> > I know this is somewhat sloppy. This was really just first cut implementation >> >> >> > many years ago. I expected to reimplement it marter soon, but then there was >> >> >> > never really a need for it (I am trying to avoid late IPA optimizations so the >> >> >> > partitioning decisions should mostly affect compile time performance only). >> >> >> > If ARM is more sensitive for partitining, perhaps it would make sense to try to >> >> >> > look for something smarter. >> >> >> > >> >> >> >> + >> >> >> >> npartitions = 1; >> >> >> >> partition = new_partition (""); >> >> >> >> if (symtab->dump_file) >> >> >> >> diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c >> >> >> >> index 9dd513f..294b8a4 100644 >> >> >> >> --- a/gcc/lto/lto.c >> >> >> >> +++ b/gcc/lto/lto.c >> >> >> >> @@ -3112,6 +3112,12 @@ do_whole_program_analysis (void) >> >> >> >> timevar_pop (TV_WHOPR_WPA); >> >> >> >> >> >> >> >> timevar_push (TV_WHOPR_PARTITIONING); >> >> >> >> + >> >> >> >> + if (flag_lto_partition != LTO_PARTITION_BALANCED >> >> >> >> + && PARAM_VALUE (MAX_PARTITION_SIZE) != INT_MAX) >> >> >> >> + fatal_error (input_location, "--param max-lto-partition should only" >> >> >> >> + " be used with balanced partitioning\n"); >> >> >> >> + >> >> >> > >> >> >> > I think we should wire in resonable MAX_PARTITION_SIZE default. THe value you >> >> >> > found experimentally may be a good start. For that reason we can't really >> >> >> > refuse a value when !LTO_PARTITION_BALANCED. Just document it as parameter for >> >> >> > balanced partitioning only and add a parameter to lto_balanced_map specifying whether >> >> >> > this param should be honored (because the same path is used for partitioning to one partition) >> >> >> > >> >> >> > Otherwise the patch looks good to me modulo missing documentation. >> >> >> Thanks for the review. I have updated the patch. >> >> >> Does this version look OK ? >> >> >> I had randomly chosen 10000, not sure if that's an appropriate value >> >> >> for default. >> >> > >> >> > I think it's way too small. This is roughly the number of GIMPLE stmts >> >> > (thus roughly the number of instructions). So with say a 8 byte >> >> > instruction format it is on the order of 80kB. You'd want to have a >> >> > default of at least several ten times of large-unit-insns (also 10000). >> >> > I'd choose sth like 1000000 (one million). I find the lto-min-partition >> >> > number quite small as well (and up it by a factor of 10). >> >> Done in this version. >> > >> > I'd do that separately. >> > >> > Please no default parameter for lto_balanced_map (), instead change >> > all callers. >> > >> >> Is it OK after bootstrap+test ? >> > >> > Note that this is for stage1 only. I'll leave approval to Honza >> > (also verification of the default max param - not sure if for example >> > chromium or firefox should/will be split to more than 32 partitions >> > with the patch) >> Removed default parameter in this version. I verified with the patch >> for chromium LTO build: >> n_lto_partitions == 32, ltrans_partitions.length() == 31 > > Just noticed that lto_balanced_map already gets PARAM_LTO_PARTITIONS, > so why not pass it PARAM_MAX_PARTITION_SIZE or 0 (as magic value for > unlimited) instead of a bool parameter? Indeed. Instead of 0, would it be OK to pass INT_MAX as 2nd parameter in case of single partition, since in that case partition->insns > max_partition_size will never be true, which would effectively ignore max_partition_size. Thanks, Prathamesh > > Richard. > >> Thanks, >> Prathamesh >> > >> > Richard. >> > >> >> Thanks, >> >> Prathamesh >> >> > >> >> > Richard. >> >> > >> >> >> I have a silly question about partitioning: Does it hamper >> >> >> transformations on ipa optimizations if caller and >> >> >> callee get placed in separate partitions ? For instance if callee is >> >> >> supposed to be inlined >> >> >> into caller, would inlining still take place if callee and caller get >> >> >> placed in separate partitions ? >> >> >> I tried with a trivial example with -flto-partition=max >> >> >> which created 3 partitions for 3 functions (bar, foo and main), and it was >> >> >> able to inline bar into foo and foo into main. I am not sure how that happens. >> >> >> I thought ltrans can perform transformations on functions only within >> >> >> a single partition >> >> >> and not across partitions ? >> >> >> >> >> >> Thanks, >> >> >> Prathamesh >> >> >> > >> >> >> > Honza >> >> >> >> >> > >> >> > -- >> >> > Richard Biener >> >> > SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg) >> >> >> > >> > -- >> > Richard Biener >> > SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg) >> > > -- > Richard Biener > SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 9e54bb7..f0de7ec 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -9477,6 +9477,11 @@ Size of minimal partition for WHOPR (in estimated instructions). This prevents expenses of splitting very small programs into too many partitions. +@item lto-max-partition +Size of max partition for WHOPR (in estimated instructions). +to provide an upper bound for individual size of partition. +Meant to be used only with balanced partitioning. + @item cxx-max-namespaces-for-diagnostic-help The maximum number of namespaces to consult for suggestions when C++ name lookup fails for an identifier. The default is 1000. diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c index 9eb63c2..bd6dc1e 100644 --- a/gcc/lto/lto-partition.c +++ b/gcc/lto/lto-partition.c @@ -447,7 +447,7 @@ add_sorted_nodes (vec &next_nodes, ltrans_partition partition) and in-partition calls was reached. */ void -lto_balanced_map (int n_lto_partitions) +lto_balanced_map (int n_lto_partitions, int max_partition_size) { int n_nodes = 0; int n_varpool_nodes = 0, varpool_pos = 0, best_varpool_pos = 0; @@ -511,6 +511,9 @@ lto_balanced_map (int n_lto_partitions) varpool_order.qsort (varpool_node_cmp); /* Compute partition size and create the first partition. */ + if (PARAM_VALUE (MIN_PARTITION_SIZE) > max_partition_size) + fatal_error (input_location, "min partition size cannot be greater than max partition size"); + partition_size = total_size / n_lto_partitions; if (partition_size < PARAM_VALUE (MIN_PARTITION_SIZE)) partition_size = PARAM_VALUE (MIN_PARTITION_SIZE); @@ -719,7 +723,8 @@ lto_balanced_map (int n_lto_partitions) best_cost, best_internal, best_i); /* Partition is too large, unwind into step when best cost was reached and start new partition. */ - if (partition->insns > 2 * partition_size) + if (partition->insns > 2 * partition_size + || partition->insns > max_partition_size) { if (best_i != i) { diff --git a/gcc/lto/lto-partition.h b/gcc/lto/lto-partition.h index 31e3764..b0b533b 100644 --- a/gcc/lto/lto-partition.h +++ b/gcc/lto/lto-partition.h @@ -35,7 +35,7 @@ extern vec ltrans_partitions; void lto_1_to_1_map (void); void lto_max_map (void); -void lto_balanced_map (int); +void lto_balanced_map (int, int); void lto_promote_cross_file_statics (void); void free_ltrans_partitions (void); void lto_promote_statics_nonwpa (void); diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index 9dd513f..7663a5b 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -3117,9 +3118,10 @@ do_whole_program_analysis (void) else if (flag_lto_partition == LTO_PARTITION_MAX) lto_max_map (); else if (flag_lto_partition == LTO_PARTITION_ONE) - lto_balanced_map (1); + lto_balanced_map (1, INT_MAX); else if (flag_lto_partition == LTO_PARTITION_BALANCED) - lto_balanced_map (PARAM_VALUE (PARAM_LTO_PARTITIONS)); + lto_balanced_map (PARAM_VALUE (PARAM_LTO_PARTITIONS), + PARAM_VALUE (MAX_PARTITION_SIZE)) else gcc_unreachable (); diff --git a/gcc/params.def b/gcc/params.def index 9362c15..b5da384 100644 --- a/gcc/params.def +++ b/gcc/params.def @@ -1029,6 +1029,11 @@ DEFPARAM (MIN_PARTITION_SIZE, "Minimal size of a partition for LTO (in estimated instructions).", 1000, 0, 0) +DEFPARAM (MAX_PARTITION_SIZE, + "lto-max-partition", + "Maximal size of a partition for LTO (in estimated instructions).", + 1000000, 0, INT_MAX) + /* Diagnostic parameters. */ DEFPARAM (CXX_MAX_NAMESPACES_FOR_DIAGNOSTIC_HELP,