From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 63C25385734E for ; Tue, 9 Aug 2022 11:55:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 63C25385734E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5AF8A340F1; Tue, 9 Aug 2022 11:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1660046111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l3/phQc5O5Z52YlTZsrW+IyQ7JuTftadkmTt/1W5/uE=; b=buKKX0pvxf7jlg96ehrV1YaYfn6wxRA9WvmlbQQd1mYDJplz/qRswdo84Sfw9lT7bK7mYY TTx7FD+RUzcEM/oLNQvumKOtm8xgBgRYZhrnDnzcU14n1JSWf9yG6sEPXKq81iZUO26DE8 Fm1o7wwGUzKfE2bmv3LknZo/atweaWY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1660046111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l3/phQc5O5Z52YlTZsrW+IyQ7JuTftadkmTt/1W5/uE=; b=Fa4ZeDRq99uRHgtqcAXddbSKozKKyI/ch4qAoOIi6csjbYiA4wSnN/zXxy7ctWEmpLY8gT OG9vlqXIcwmCWpCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 43E6313A9D; Tue, 9 Aug 2022 11:55:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id bG5KDx9L8mJOfwAAMHmgww (envelope-from ); Tue, 09 Aug 2022 11:55:11 +0000 Message-ID: Date: Tue, 9 Aug 2022 13:55:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.1.0 Subject: Re: [PATCH] lto: support --jobserver-style=fifo for recent GNU make Content-Language: en-US To: Richard Biener Cc: GCC Patches , Jan Hubicka References: From: =?UTF-8?Q?Martin_Li=c5=a1ka?= In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2022 11:55:14 -0000 On 8/5/22 12:58, Richard Biener wrote: > On Thu, Aug 4, 2022 at 10:57 AM Martin Liška wrote: >> >> After a long time, GNU make has finally implemented named pipes when >> it comes to --jobserver-auth. The traditional approach are >> provided opened file descriptors that causes troubles: >> https://savannah.gnu.org/bugs/index.php?57242 >> >> GNU make commit: >> https://git.savannah.gnu.org/cgit/make.git/commit/?id=7ad2593b2d2bb5b9332f4444d8bf93ac6f958bc6 >> >> I tested that locally with TOT GNU make and it works: >> >> $ cat Makefile >> all: >> g++ tramp3d-v4.ii -c -flto -O2 >> g++ tramp3d-v4.o -flto=jobserver >> >> $ MAKE=/tmp/bin/bin/make /tmp/bin/bin/make -j16 --jobserver-style=fifo >> g++ tramp3d-v4.ii -c -flto -O2 >> g++ tramp3d-v4.o -flto=jobserver >> (ltrans run in parallel) >> >> Ready to be installed after tests? > > LGTM. I've got actually a nicer patch set where I also support jobserver for WPA. I'm going to send it in a separate thread. Martin > > Thanks, > Richard. > >> Martin >> >> gcc/ChangeLog: >> >> * gcc.cc (driver::detect_jobserver): Support --jobserver-style=fifo. >> * lto-wrapper.cc (jobserver_active_p): Likewise. >> --- >> gcc/gcc.cc | 15 ++++++++++++--- >> gcc/lto-wrapper.cc | 20 +++++++++++++++----- >> 2 files changed, 27 insertions(+), 8 deletions(-) >> >> diff --git a/gcc/gcc.cc b/gcc/gcc.cc >> index 5cbb38560b2..c98407fe03d 100644 >> --- a/gcc/gcc.cc >> +++ b/gcc/gcc.cc >> @@ -9182,15 +9182,24 @@ driver::detect_jobserver () const >> const char *makeflags = env.get ("MAKEFLAGS"); >> if (makeflags != NULL) >> { >> - const char *needle = "--jobserver-auth="; >> - const char *n = strstr (makeflags, needle); >> + /* Traditionally, GNU make uses opened pieps for jobserver-auth, >> + e.g. --jobserver-auth=3,4. */ >> + const char *pipe_needle = "--jobserver-auth="; >> + >> + /* Starting with GNU make 4.4, one can use --jobserver-style=fifo >> + and then named pipe is used: --jobserver-auth=fifo:/tmp/hcsparta. */ >> + const char *fifo_needle = "--jobserver-auth=fifo:"; >> + if (strstr (makeflags, fifo_needle) != NULL) >> + return; >> + >> + const char *n = strstr (makeflags, pipe_needle); >> if (n != NULL) >> { >> int rfd = -1; >> int wfd = -1; >> >> bool jobserver >> - = (sscanf (n + strlen (needle), "%d,%d", &rfd, &wfd) == 2 >> + = (sscanf (n + strlen (pipe_needle), "%d,%d", &rfd, &wfd) == 2 >> && rfd > 0 >> && wfd > 0 >> && is_valid_fd (rfd) >> diff --git a/gcc/lto-wrapper.cc b/gcc/lto-wrapper.cc >> index 795ab74555c..756350d5ace 100644 >> --- a/gcc/lto-wrapper.cc >> +++ b/gcc/lto-wrapper.cc >> @@ -1342,27 +1342,37 @@ static const char * >> jobserver_active_p (void) >> { >> #define JS_PREFIX "jobserver is not available: " >> - #define JS_NEEDLE "--jobserver-auth=" >> + >> + /* Traditionally, GNU make uses opened pieps for jobserver-auth, >> + e.g. --jobserver-auth=3,4. */ >> + #define JS_PIPE_NEEDLE "--jobserver-auth=" >> + >> + /* Starting with GNU make 4.4, one can use --jobserver-style=fifo >> + and then named pipe is used: --jobserver-auth=fifo:/tmp/hcsparta. */ >> + #define JS_FIFO_NEEDLE "--jobserver-auth=fifo:" >> >> const char *makeflags = getenv ("MAKEFLAGS"); >> if (makeflags == NULL) >> return JS_PREFIX "% environment variable is unset"; >> >> - const char *n = strstr (makeflags, JS_NEEDLE); >> + if (strstr (makeflags, JS_FIFO_NEEDLE) != NULL) >> + return NULL; >> + >> + const char *n = strstr (makeflags, JS_PIPE_NEEDLE); >> if (n == NULL) >> - return JS_PREFIX "%<" JS_NEEDLE "%> is not present in %"; >> + return JS_PREFIX "%<" JS_PIPE_NEEDLE "%> is not present in %"; >> >> int rfd = -1; >> int wfd = -1; >> >> - if (sscanf (n + strlen (JS_NEEDLE), "%d,%d", &rfd, &wfd) == 2 >> + if (sscanf (n + strlen (JS_PIPE_NEEDLE), "%d,%d", &rfd, &wfd) == 2 >> && rfd > 0 >> && wfd > 0 >> && is_valid_fd (rfd) >> && is_valid_fd (wfd)) >> return NULL; >> else >> - return JS_PREFIX "cannot access %<" JS_NEEDLE "%> file descriptors"; >> + return JS_PREFIX "cannot access %<" JS_PIPE_NEEDLE "%> file descriptors"; >> } >> >> /* Print link to -flto documentation with a hint message. */ >> -- >> 2.37.1 >>