From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 0C5D43858D33 for ; Fri, 5 May 2023 15:42:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0C5D43858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-50c8d87c775so1404416a12.3 for ; Fri, 05 May 2023 08:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683301367; x=1685893367; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=n+1XySz2Edto/b9s7Ed0Hf4JREM2NoAGj7Ma7jlowP0=; b=okw5giRQ1sY69wb1KPNW2MUBEaD8AOkqTKOLMYCDviA7AEiLn2gn/FGRZlp78KPeCK H0gGOYXvWEbosEzwmlU+Ru0gfXulMK9/o2siugDHfcE5hpIXBnehfKga8PCfKcUNw117 9MG+zXhFXwAwtfIQNfj/kYeDDe+CZskie8+tGgtNkgHUbXvlxU7s6FEYdjgZ2EgUU8TC Ih6EgRlQweI104mptLf+DahTedhnPwWxyxzu05LQFUttiHlFouI6qvLgsRQPfcEHWG1H /wLcfHVCaRAbY4G6vjdtCA9XI/8rLWkhtpk+j/yagm0cMoL6G3dOpqcWf75sLuMDiOts 3+oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683301367; x=1685893367; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n+1XySz2Edto/b9s7Ed0Hf4JREM2NoAGj7Ma7jlowP0=; b=I02BCNBFwBc6S/E6HjtOj4DHlzUjXOwC98fSw5biWnOfh7kb5nC8SbG3GitB2Rd/vV 9duFMJ4wF7P9F6QFNdF2AqVVyR1FJMXRTJXF3fdRWKhQlJmCMrR3lWL8HqaRKp7yLN8z jbG6P2gEm+SwyKk129lqUnszR2YT60TS5idUyrabX3pHPSkjIN2MDAanXIxvGZtpD6si ccwBQE8pEPPLlrpbrVw2NVuIQTfcMlMF0xyPvFAz0waDlJ22ZlRupkS6aFBXdTvrB6yy fBU6TtJRAoC1dqxlS0oE8r/D1GwW/VvmXxbyL3KZv9ah/KFd8k+ofHIENiwMExwgelTM kekQ== X-Gm-Message-State: AC+VfDyJqjETbAFLpIS9KELkZLyFh+Aes8uWisfBdtWC2EkVdw4aphoH RnClc/lk9FIGao7m4xVVgDpKHBEVo+M2OLwjJI8= X-Google-Smtp-Source: ACHHUZ5rK26rCWJ5mjOyzBBZk+oucbCfEhGrB+Clj4O+27ptIYPxrbzPk3rylR8AD8T+HlbvHxranZl8yKY0vZ+HbFE= X-Received: by 2002:a17:907:802:b0:94f:7edf:8fa1 with SMTP id wv2-20020a170907080200b0094f7edf8fa1mr1616942ejb.32.1683301366737; Fri, 05 May 2023 08:42:46 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: David Edelsohn Date: Fri, 5 May 2023 11:41:04 -0400 Message-ID: Subject: Re: [PATCH 5/5] match.pd: Use splits in makefile and make configurable. To: Tamar Christina Cc: Jakub Jelinek , Jeff Law , GCC Patches Content-Type: multipart/alternative; boundary="00000000000003afd305faf424b7" X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,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 List-Id: --00000000000003afd305faf424b7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, May 5, 2023 at 11:38=E2=80=AFAM Tamar Christina wrote: > > -----Original Message----- > > From: Jakub Jelinek > > Sent: Friday, May 5, 2023 4:33 PM > > To: Tamar Christina > > Cc: Jeff Law ; David Edelsohn >; > > GCC Patches > > Subject: Re: [PATCH 5/5] match.pd: Use splits in makefile and make > > configurable. > > > > On Fri, May 05, 2023 at 03:22:11PM +0000, Tamar Christina wrote: > > > > We require GNU make, so perhaps we could use something like > > > > $(wordlist > > > > 1,$(NUM_MATCH_SPLITS),$(check_p_numbers)) > > > > instead of > > > > $(shell seq 1 $(NUM_MATCH_SPLITS)) > > > > provided we move the check_p_numbers definition earlier (or perhaps > > > > bettter rename it to something more generic, so that it is clear > > > > that is a variable holding numbers from 1 to 9999. > > > > > > I'm currently testing > > > > > > NUM_MATCH_SPLITS =3D @DEFAULT_MATCHPD_PARTITIONS@ - > > MATCH_SPLITS_SEQ =3D > > > $(shell seq 1 $(NUM_MATCH_SPLITS)) > > > +MATCH_SPLITS_SEQ =3D $(shell echo {1..$(NUM_MATCH_SPLITS)}) > > > > > > Which seems to work since it looks like we require an sh compatible > shell. > > > > > > Question is this right? From the existing > > > > AIX /bin/sh certainly doesn't handle that. > > Wow, wonder what sh version it has.. > > > > > But what do I know about AIX... > > Same.. > AIX defaults to Korn Shell. I always use Bash on AIX to build GCC and recommend Bash in the GCC build instructions for AIX. Do we want to require Bash? Bash is a more self-contained requirement than seq from coreutils. Thanks, David > > > > > This seems to work and we use it already in the Makefile. > > If something else works portably, we could change both spots... > > > > 2023-05-05 Jakub Jelinek > > > > * Makefile.in (check_p_numbers): Rename to one_to_9999, move > > earlier with helper variables also renamed. > > (MATCH_SPLUT_SEQ): Use $(wordlist > > 1,$(NUM_MATCH_SPLITS),$(one_to_9999)) > > instead of $(shell seq 1 $(NUM_MATCH_SPLITS)). > > (check_p_subdirs): Use $(one_to_9999) instead of > > $(check_p_numbers). > > > > --- gcc/Makefile.in.jj 2023-05-05 16:02:37.180575333 +0200 > > +++ gcc/Makefile.in 2023-05-05 17:20:27.923251821 +0200 > > @@ -214,9 +214,19 @@ rtl-ssa-warn =3D $(STRICT_WARN) > > GCC_WARN_CFLAGS =3D $(LOOSE_WARN) $(C_LOOSE_WARN) $($(@D)-warn) > > $(if $(filter-out $(STRICT_WARN),$($(@D)-warn)),,$(C_STRICT_WARN)) > > $(NOCOMMON_FLAG) $($@-warn) GCC_WARN_CXXFLAGS =3D > > $(LOOSE_WARN) $($(@D)-warn) $(NOCOMMON_FLAG) $($@-warn) > > > > +# 1 2 3 ... 9999 > > +one_to_9999_0:=3D1 2 3 4 5 6 7 8 9 > > +one_to_9999_1:=3D0 $(one_to_9999_0) > > +one_to_9999_2:=3D$(foreach i,$(one_to_9999_0),$(addprefix > > +$(i),$(one_to_9999_1))) one_to_9999_3:=3D$(addprefix > > 0,$(one_to_9999_1)) > > +$(one_to_9999_2) one_to_9999_4:=3D$(foreach > > +i,$(one_to_9999_0),$(addprefix $(i),$(one_to_9999_3))) > > +one_to_9999_5:=3D$(addprefix 0,$(one_to_9999_3)) $(one_to_9999_4) > > +one_to_9999_6:=3D$(foreach i,$(one_to_9999_0),$(addprefix > > +$(i),$(one_to_9999_5))) > > +one_to_9999:=3D$(one_to_9999_0) $(one_to_9999_2) $(one_to_9999_4) > > +$(one_to_9999_6) > > + > > # The number of splits to be made for the match.pd files. > > NUM_MATCH_SPLITS =3D @DEFAULT_MATCHPD_PARTITIONS@ - > > MATCH_SPLITS_SEQ =3D $(shell seq 1 $(NUM_MATCH_SPLITS)) > > +MATCH_SPLITS_SEQ =3D $(wordlist > > 1,$(NUM_MATCH_SPLITS),$(one_to_9999)) > > GIMPLE_MATCH_PD_SEQ_SRC =3D $(patsubst %, gimple-match-%.cc, > > $(MATCH_SPLITS_SEQ)) GIMPLE_MATCH_PD_SEQ_O =3D $(patsubst %, gimple- > > match-%.o, $(MATCH_SPLITS_SEQ)) GENERIC_MATCH_PD_SEQ_SRC =3D > > $(patsubst %, generic-match-%.cc, $(MATCH_SPLITS_SEQ)) @@ -4234,18 > > +4244,10 @@ $(patsubst %,%-subtargets,$(lang_checks) > > check_p_tool=3D$(firstword $(subst _, ,$*)) > > check_p_count=3D$(check_$(check_p_tool)_parallelize) > > check_p_subno=3D$(word 2,$(subst _, ,$*)) > > -check_p_numbers0:=3D1 2 3 4 5 6 7 8 9 > > -check_p_numbers1:=3D0 $(check_p_numbers0) - > > check_p_numbers2:=3D$(foreach i,$(check_p_numbers0),$(addprefix > > $(i),$(check_p_numbers1))) -check_p_numbers3:=3D$(addprefix > > 0,$(check_p_numbers1)) $(check_p_numbers2) - > > check_p_numbers4:=3D$(foreach i,$(check_p_numbers0),$(addprefix > > $(i),$(check_p_numbers3))) -check_p_numbers5:=3D$(addprefix > > 0,$(check_p_numbers3)) $(check_p_numbers4) - > > check_p_numbers6:=3D$(foreach i,$(check_p_numbers0),$(addprefix > > $(i),$(check_p_numbers5))) > > -check_p_numbers:=3D$(check_p_numbers0) $(check_p_numbers2) > > $(check_p_numbers4) $(check_p_numbers6) check_p_subdir=3D$(subst _,,$*) > > check_p_subdirs=3D$(wordlist 1,$(check_p_count),$(wordlist 1, \ > > $(if > > $(GCC_TEST_PARALLEL_SLOTS),$(GCC_TEST_PARALLEL_SLOTS),128), \ > > - $(check_p_numbers))) > > + $(one_to_9999))) > > Thanks, If it works I'm happy, I can rebase my other patches to use this. > > Thank you! > > Regards, > Tamar > > > > > # For parallelized check-% targets, this decides whether > parallelization # is > > desirable (if -jN is used). If desirable, recursive make is run with > > > > > > Jakub > > --00000000000003afd305faf424b7--