From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id 1B4FA3858031 for ; Mon, 15 Nov 2021 19:51:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B4FA3858031 Received: by mail-pg1-x534.google.com with SMTP id m15so11596910pgu.11 for ; Mon, 15 Nov 2021 11:51:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CGMzXacj/jidlUZ/6wJ+5iL7lCiUwT4EOlovOUElS58=; b=KRybxKCr69THjTpT8DLLndmvUiwTe7Mt+fTczN2LNydGWdGV2fmbjmKgFv5GF0J5NT BVwwFRZCgOFG5tBmec4qd/eD7z20VukUKxMK5j2U3zRxIsjvQAOaNKmZKB4QgOb/i5Zg 67S0UEUU1RFwpYstH+riZMwfGaqkTuO7ahpXsXY54A8fiYHhuqyNYb7ZMG+F8mJ3ivcd TTIWTdYvWri2sj8wN+BgbG5SuIi9SqlEu5QBAzK7RUK2Nd/+WPLNE+CCbpXRJEl019ue E5mU7gy+G9SgRhK+LKrBmazMLyLUy3gR7OptH0NYdAJM/+pjkJi4qkBmYz/55pvzELcF TV9g== X-Gm-Message-State: AOAM531ciCvX0YKQ0llEg50hPvQ4zMlJPAgZmZ3Lh0/uxNmhoNwiAxn9 3TB/Tiqq0bzCrtkYSXTm5Jw3waSb0IjmgCwmPhRD4mctz5U= X-Google-Smtp-Source: ABdhPJy0xZNZ2JgKES19IOjc8c0csELPMJs6iIivDIAZyvAaBe8OR1F1rsh12llEYQCIp1NdoC0xq0M1HOa40rQqjhw= X-Received: by 2002:a05:6a00:2351:b0:47b:d092:d2e4 with SMTP id j17-20020a056a00235100b0047bd092d2e4mr34396452pfj.76.1637005896103; Mon, 15 Nov 2021 11:51:36 -0800 (PST) MIME-Version: 1.0 References: <20211108154211.167829-1-hjl.tools@gmail.com> <20211108154211.167829-3-hjl.tools@gmail.com> In-Reply-To: From: "H.J. Lu" Date: Mon, 15 Nov 2021 11:51:00 -0800 Message-ID: Subject: Re: [PATCH v2 2/2] elf: Pre-generate Makefile fragment for DSO sorting tests [BZ #28550] To: Adhemerval Zanella Cc: GNU C Library , Florian Weimer Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3028.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Nov 2021 19:51:40 -0000 On Mon, Nov 15, 2021 at 10:59 AM Adhemerval Zanella wrote: > > > > On 08/11/2021 12:42, H.J. Lu via Libc-alpha wrote: > > Generate Makefile fragment for DSO sorting tests at configure time. > > > > This partially fixes BZ #28550. > > I am not sure if configure.ac is the right place to generate the Makefile > fragment required for tests. Can we use 'avoid-generated' instead? > > > diff --git a/elf/Makefile b/elf/Makefile > index a311c3e23c..8556105a20 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -491,6 +491,7 @@ tests-special += $(objpfx)order-cmp.out $(objpfx)tst-array1-cmp.out \ > $(objpfx)tst-unused-dep-cmp.out > endif > > +ifndef avoid-generated > # DSO sorting tests: > # The dso-ordering-test.py script generates testcase source files in $(objpfx), > # creating a $(objpfx)-dir for each testcase, and creates a > @@ -507,6 +508,7 @@ ifeq (yes,$(have-tunables)) > $(eval $(call include_dsosort_tests,dso-sort-tests-1.def)) > $(eval $(call include_dsosort_tests,dso-sort-tests-2.def)) > endif > +endif It doesn't work. "make check -j28" on a machine with 112 cores failed: /export/users/hjl/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/elf/dso-sort-tests-1.def.generated-makefile:938: warning: ignoring old recipe for target '/export/users/hjl/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/elf/tst-dso-ordering9-dir/tst-dso-ordering9_25-bacde-b.so' ... make[3]: *** [Makefile:483: elf/tests] Error 2 I couldn't find the exact error message in a very long make log file. > check-abi: $(objpfx)check-abi-ld.out > tests-special += $(objpfx)check-abi-ld.out > > > > --- > > configure | 11 +++++++++++ > > configure.ac | 12 ++++++++++++ > > elf/Makefile | 22 +++++----------------- > > 3 files changed, 28 insertions(+), 17 deletions(-) > > > > diff --git a/configure b/configure > > index 2f9adca064..91993da3b9 100755 > > --- a/configure > > +++ b/configure > > @@ -8484,3 +8484,14 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then > > $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} > > fi > > > > + > > +if test "$have_tunables" = yes; then > > + test -d elf || mkdir elf > > + objdir=`pwd` > > + rm -f elf/dso-sort-tests.mk > > + (for d in dso-sort-tests-1.def dso-sort-tests-2.def > > + do > > + $PYTHON $srcdir/scripts/dso-ordering-test.py \ > > + --description-file $srcdir/elf/$d --objpfx $objdir/elf/ > > + done) > elf/dso-sort-tests.mk > > +fi > > diff --git a/configure.ac b/configure.ac > > index 7eb4239359..faf70b930c 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -1901,3 +1901,15 @@ echo "$config_vars" >> config.make;; > > esac > > test -d bits || mkdir bits]],[[config_vars='$config_vars']]) > > AC_OUTPUT > > + > > +dnl Generate Makefile fragments for DSO sorting tests. > > +if test "$have_tunables" = yes; then > > + test -d elf || mkdir elf > > + objdir=`pwd` > > + rm -f elf/dso-sort-tests.mk > > + (for d in dso-sort-tests-1.def dso-sort-tests-2.def > > + do > > + $PYTHON $srcdir/scripts/dso-ordering-test.py \ > > + --description-file $srcdir/elf/$d --objpfx $objdir/elf/ > > + done) > elf/dso-sort-tests.mk > > +fi > > diff --git a/elf/Makefile b/elf/Makefile > > index 41c19668c3..6995ccaa0f 100644 > > --- a/elf/Makefile > > +++ b/elf/Makefile > > @@ -366,6 +366,11 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > > tst-auxvalmod \ > > tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ > > > > +ifeq (yes,$(have-tunables)) > > +# Include Makefile fragments for DSO sorting tests. > > +include $(objpfx)dso-sort-tests.mk > > +endif > > + > > # Most modules build with _ISOMAC defined, but those filtered out > > # depend on internal headers. > > modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\ > > @@ -486,23 +491,6 @@ tests-special += $(objpfx)order-cmp.out $(objpfx)tst-array1-cmp.out \ > > $(objpfx)tst-unused-dep-cmp.out > > endif > > > > -# DSO sorting tests: > > -# The dso-ordering-test.py script generates testcase source files in $(objpfx), > > -# creating a $(objpfx)-dir for each testcase, and creates a > > -# Makefile fragment to be included. > > -define include_dsosort_tests > > -$(objpfx)$(1).generated-makefile: $(1) > > - $(PYTHON) $(..)scripts/dso-ordering-test.py \ > > - --description-file $$< --objpfx $(objpfx) --output-makefile $$@ > > -include $(objpfx)$(1).generated-makefile > > -endef > > - > > -# Generate from each testcase description file > > -ifeq (yes,$(have-tunables)) > > -$(eval $(call include_dsosort_tests,dso-sort-tests-1.def)) > > -$(eval $(call include_dsosort_tests,dso-sort-tests-2.def)) > > -endif > > - > > check-abi: $(objpfx)check-abi-ld.out > > tests-special += $(objpfx)check-abi-ld.out > > update-abi: update-abi-ld > > -- H.J.