From patchwork Tue Apr 5 11:11:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prathamesh Kulkarni X-Patchwork-Id: 65063 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp395605lbc; Tue, 5 Apr 2016 04:11:46 -0700 (PDT) X-Received: by 10.98.16.22 with SMTP id y22mr39598220pfi.50.1459854706827; Tue, 05 Apr 2016 04:11:46 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id i64si961246pfi.132.2016.04.05.04.11.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 04:11:46 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-424390-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-424390-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-424390-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=sY8mgqP7X0VvsfgOMv FGalRaYDQMhezzPy/52iUN4sRkc6Wx/KiSxC0s8PI2xyEpet0mwrgwdrH6DIUE2X tygYRhSIqX/k9r8nx2CuaHZpi/MUjEQ2stUQMG0+Z+InbWF1sy/pYw4p5JIl5HQr OOWCDstn7z5sNbeME5qmDPNSM= 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=T/0vIoLE5vwZ5ZXDaYkSWTTQ Mbo=; b=HF+oDHAZGZXuQ0tf1DV+h0pnIBrF3E6lG22Q1k4npW89UXoCQvhil6ZJ Ra1JkEnClS6m7ic8x4HcEfDKUDq38oJB9qvKat9nf7Vu6oCn2n/wnxV42CaQlj4G hkEM2Q9MRZh3m3vjNx2/EkV1p+7knir2U1P9F6qiROVWRFwpoyk= Received: (qmail 9675 invoked by alias); 5 Apr 2016 11:11:24 -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 9621 invoked by uid 89); 5 Apr 2016 11:11:17 -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=4477, 31177, 7239, expenses X-HELO: mail-ig0-f180.google.com Received: from mail-ig0-f180.google.com (HELO mail-ig0-f180.google.com) (209.85.213.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 05 Apr 2016 11:11:06 +0000 Received: by mail-ig0-f180.google.com with SMTP id ui10so10803815igc.1 for ; Tue, 05 Apr 2016 04:11:06 -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=HZuOQZdpHR/S7xZ4Yr3HN5/01jt49qKefJqIFYlMl7Q=; b=PLqbYSNeUJ9h0Km0acqXBFf5n8oT5mWWmELHIkoVz5HEzkwRE/xqICRyJleSvsX5Sr idp4eQb78vSUzV+hQ/Tde90tsafFJ/US8HrviwssMJWbBRV+CK0WvYgZXAKM+tjwwMSh B0M1mBAyVr2DBCXmNSrMr+Zhl7anwAmFdYb8CQOXmOWIG7pV2J9Sz93PzjZTE0XfbdSM 6wlaLiCMM+kl+HlYK7O8NEdQD20mZLTlsF4FOslza5a1ckIESzYStnKS8SEbczkaPpzv wiXzzACNdA/WIMAINQFxFsK902Vi4RCRGX0+CKzCy39xtg/DVeC+Lwf7qAqY4U8Vt+b8 QyMQ== X-Gm-Message-State: AD7BkJLM3G4F8WX4JG77bsGmj/Y0EfGE1QCagIsLceplgerbuUDq1Dr9LRtpqXRwLmSllYGPya3uJB9SVz2HY8sv MIME-Version: 1.0 X-Received: by 10.50.29.114 with SMTP id j18mr8714774igh.62.1459854664892; Tue, 05 Apr 2016 04:11:04 -0700 (PDT) Received: by 10.36.196.5 with HTTP; Tue, 5 Apr 2016 04:11:04 -0700 (PDT) In-Reply-To: <20160404141436.GB95176@kam.mff.cuni.cz> References: <20160404120030.GD14122@kam.mff.cuni.cz> <20160404141436.GB95176@kam.mff.cuni.cz> Date: Tue, 5 Apr 2016 16:41:04 +0530 Message-ID: Subject: Re: [RFC] introduce --param max-lto-partition for having an upper bound on partition size From: Prathamesh Kulkarni To: Jan Hubicka Cc: Richard Biener , gcc Patches , Ramana Radhakrishnan X-IsSubscribed: yes 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 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 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..d385dd9 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, bool honor_max_partition) { 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) > 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); @@ -719,7 +723,9 @@ 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 + || (honor_max_partition + && partition->insns > PARAM_VALUE (MAX_PARTITION_SIZE))) { if (best_i != i) { diff --git a/gcc/lto/lto-partition.h b/gcc/lto/lto-partition.h index 31e3764..2992bee 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, bool honor_max_partition = true); 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..82bd9b3 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -3117,7 +3118,7 @@ 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, false); else if (flag_lto_partition == LTO_PARTITION_BALANCED) lto_balanced_map (PARAM_VALUE (PARAM_LTO_PARTITIONS)); else diff --git a/gcc/params.def b/gcc/params.def index 9362c15..9f8a648 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).", + 10000, 0, INT_MAX) + /* Diagnostic parameters. */ DEFPARAM (CXX_MAX_NAMESPACES_FOR_DIAGNOSTIC_HELP,