Re: [PATCH] perf tools: Move feature cleanup under tools/build

From: Jiri Olsa
Date: Thu Feb 25 2021 - 08:43:29 EST


On Thu, Feb 25, 2021 at 11:10:00AM +0100, Sedat Dilek wrote:
> On Wed, Feb 24, 2021 at 4:38 PM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
> >
> > Arnaldo reported issue for following build command:
> >
> > $ rm -rf /tmp/krava; mkdir /tmp/krava; make O=/tmp/krava clean
> > CLEAN config
> > /bin/sh: line 0: cd: /tmp/krava/feature/: No such file or directory
> > ../../scripts/Makefile.include:17: *** output directory "/tmp/krava/feature/" does not exist. Stop.
> > make[1]: *** [Makefile.perf:1010: config-clean] Error 2
> > make: *** [Makefile:90: clean] Error 2
> >
> > The problem is that now that we include scripts/Makefile.include
> > in feature's Makefile (which is fine and needed), we need to ensure
> > the OUTPUT directory exists, before executing (out of tree) clean
> > command.
> >
> > Removing the feature's cleanup from perf Makefile and fixing
> > feature's cleanup under build Makefile, so it now checks that
> > there's existing OUTPUT directory before calling the clean.
> >
> > Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx>
>
> For my new friends from linux-bpf and linux-perf...
>
> I tested your patch on top of Linux v5.11-10201-gc03c21ba6f4e.
>
> git checkout c03c21ba6f4e -b for-5.12/perf-tools_feature_cleanup-jolsa
> git branch --show-current
>
> link="https://lore.kernel.org/r/20210224150831.409639-1-jolsa@xxxxxxxxxx";
> b4 am $link -o - | git am
>
> LLVM_TOOLCHAIN_PATH="/opt/llvm-toolchain/bin"
> if [ -d ${LLVM_TOOLCHAIN_PATH} ]; then
> export PATH="${LLVM_TOOLCHAIN_PATH}:${PATH}"
> fi
> echo $PATH
>
> MAKE="make V=1"
> MAKE_OPTS="HOSTCC=clang HOSTCXX=clang++ HOSTLD=ld.lld CC=clang
> LD=ld.lld LLVM=1 LLVM_IAS=1"
> MAKE_OPTS="$MAKE_OPTS PAHOLE=/opt/pahole/bin/pahole"
> echo $MAKE $MAKE_OPTS
>
> LC_ALL=C $MAKE -j1 $MAKE_OPTS -C tools/ clean 2>&1 | tee
> ../make-log_tools-clean_before-perf-build.txt
>
> LC_ALL=C PYTHON=python3 $MAKE -j4 $MAKE_OPTS -C tools/perf/ 2>&1 | tee
> ../make-log_tools-perf.txt
>
> grep gcc ../make-log_tools-perf.txt
> [ empty ]
>
> LC_ALL=C $MAKE -j1 $MAKE_OPTS -C tools/ clean 2>&1 | tee
> ../make-log_tools-clean_after-perf-build.txt
>
> $ clang --version
> dileks clang version 13.0.0 (https://github.com/llvm/llvm-project.git
> c465429f286f50e52a8d2b3b39f38344f3381cce)
> Target: x86_64-unknown-linux-gnu
> Thread model: posix
> InstalledDir: /opt/llvm-toolchain/bin
>
> Logs etc. see attached tarball.
>
> Feel free to add:
>
> Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx> # LLVM/Clang v13-git

great, thanks a lot

jirka