Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-PHdr: A9a23:9eO7BRJhKJ9w8hza9tmcuZMyDhhPgJ39IxIV55w7irlHbqWk+dH4M
 VfC4el25HfTUInb4u4CgO3T4OjsWm0FtJCGtn1KMJlBTAQMhshemQs8SNWEBkv2IL+PDWQ6E
 c1OWUUj8yS9Nk5YS9zza13bvju56jtBUhn6PBB+c+LyHIOahs+r1ue0rpvUZQgAhDe0bb5oa
 husqgCEvcgNiowkIaE0mXP0
IronPort-HdrOrdr: A9a23:6x2bNqGi3Uexu/E8pLqFmZXXdLJzesId70hD6mlYcjYQWtCEls
 yogfQQ3QL1jjFUY307hdWcIsC7IE/03aVepa0cJ62rUgWjgmunK4l+8ZDvqgePJwTXzcQY76
 tpdsFFZ+HYJVJxgd/mpCyxFNg9yNeKmZrY+tv25V0Fd3AMV4hL6QBlBgGHVmh/QwdbDZQ0fa
 DsmPZvjTymZHgRc4CHHXEDRefOvJnmk5jhbB4ACXccmUizpBmv76P3FAXd4wcGX1p0sPkf2E
 Xmsyi83KWstPmn1gTRvlWy0716kMbso+Ezf/CkpdMSLlzX+2OVTaRnH4aPpTUk5NyogWxa7O
 XkhzcFE4BN52jKfmezyCGdmzXI9Do18XftxRu5rBLY0LbEbQk3AcZAmo5VGyGxgyFL0b0Ms9
 Mo40uju5VaFh/GlijmjuK4Ki1CrFa+onYpjIco/hpieLYec7NYoMg++05YAf47bVrHwb0nC+
 VnAYXg4u9XezqhHgnkl1RoqebcOkgbL1OjeAwvq8aV2z9ZkDRS1E0D3vESmX8G6dYUV4REz/
 6sCNUqqJh+CustKY5tDuYIRsW6TkbXRwjXDW6UKVP7UIkaJnP2rYLt6rld3pDpRLU4iL8J3L
 jRWlJRsmA/P2j0D9eV4ZFN+hfRBEKwQCrq0cMbw5RioLXzSP7KPES4ORUTuvrlh89aLtzQWv
 61Np4TKeTkN3HSFYFA2BC7VIJVLXUYTc0Jqtc2U1+DuavwW8rXn92eVMyWCKvmED4iVG+6KG
 AERiLPKMJJ6V3uWnKQummWZ1rdPmjEub5gGqnT+OYejKIXMJdXjwQTgVOlosWCKThItL0qbF
 JzSYmXy5+TlC2TxyLl/m9pMh1SAgJ++7P7SU5HogcMLgfzarYMu9KWfGhIx3uZLhpjT8fbeT
 Qv42hfyOaSFdi91CoiA9WoPiaxlH0Ivk+HSJ8ah+me/8v/Y4g5CZwnQaR1Eg3OG3VO6F5XgV
 YGTDVBal7UFzvoh6ngsYcdA/vHccJgxC2xJ9RPlH7ZvUKAhM0mS3cBRQSyWcqPjQtGfUsOun
 RBt4skxJuJg3KGNHY2iuVQCiw8VE2nRJZ9SDmjSKoRsLbxYw10RXqNnlWh+mEOU1uv0V4TiG
 znJTCTYtfRDDNmyypl+5ev1k9ofWOAeE81TXZ2veRGZDj7k0c29/OXbayu1GbUUH8++6U2NT
 HIZiZ6GHIy+/m+yAOVlDGeFX8v25UpOajHAK4+dqzIs0ndW7GghOUIGeRZ841iM82ruugXUf
 iHcwvQNz/gDfg1sjbl60oNKW1xqHM+l+nv1wCg5G+k3GQnCf66GiUse5gLZ9Wd5XPjXfCGzd
 Fwis80p/K5NiH0ZsSdwa/aKz5FJRW7mx/9c8g47ZRVt7k1rr19At3SVibJzmhO2FEmN9jv/X
 luNphT8fTEIMtibsYScyVW8h4gk8mONlIitkjzDvUldV8ggnfHN7qykvb1gKtqBlfEqBr7OF
 GZ/SEY5fvDUieZ3bMRCq47Iw1tGQABwWUn+PnHe5zbCQ2see0G4UGzNWWldqRBDKeCArcdo3
 9Bkp61tv7SczC93g/evTF2eP0Tt2mmRN6/GwKKF6pD9cegNVGFn6ut54qygV7MOE+GQlVdgZ
 cAc0oaKtlHgH0lioY81yCpUKz5ok4/iTJlkHhav0+o3pLj+XvRGEFNLBbQjZpXVyRCK3Tgt7
 WxzcGIkHDmpCVf0ZbNFE1MbshDFtgZQI/wNTpvI6ErzcmV1rtqhD9CbhcoB3M9jz643/oO58
 bK5Mnv
From:   "Denys Zagorui -X (dzagorui - GLOBALLOGIC INC at Cisco)" 
        <dzagorui@cisco.com>
To:     Jiri Olsa <jolsa@redhat.com>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "peterz@infradead.org" <peterz@infradead.org>,
        "mingo@redhat.com" <mingo@redhat.com>,
        "acme@kernel.org" <acme@kernel.org>,
        "mark.rutland@arm.com" <mark.rutland@arm.com>,
        "alexander.shishkin@linux.intel.com" 
        <alexander.shishkin@linux.intel.com>,
        "namhyung@kernel.org" <namhyung@kernel.org>
Subject: Re: [PATCH v3] perf: build reproducibility improvements
Thread-Topic: [PATCH v3] perf: build reproducibility improvements
Thread-Index: AQHXLUpNV2xHzZMFC0+D9RZWWX2tpaqwrO6U
Date:   Mon, 12 Apr 2021 10:13:02 +0000
Message-ID: <BY5PR11MB4024A363D492D6B444C661B0D9709@BY5PR11MB4024.namprd11.prod.outlook.com>
References: <20210408125135.8445-1-dzagorui@cisco.com>,<YHBgmopzUg4cMQhs@krava>
In-Reply-To: <YHBgmopzUg4cMQhs@krava>
Accept-Language: en-GB, en-US
Content-Language: en-GB
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 576cf4e0-d3b2-4fbd-76b6-08d8fd9b8e67
X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2021 10:13:02.2069
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 5ae1af62-9505-4097-a69a-c1553ef7840e
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: WUCA6jhmXXNNlaepIOaeKTLzsohhS39dkzpcAT9i8SXr58ILi9/bhQhR4eiebN1qLgS/KDwi+xoaHA6XsGcdoQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3464
X-OriginatorOrg: cisco.com
X-Outbound-SMTP-Client: 173.36.7.18, xbe-aln-003.cisco.com
X-Outbound-Node: alln-core-9.cisco.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> > +
> > +int perf_src_doc(const char *exec_path, char **strp)
> > +{
> > +     FILE *file;
> > +     char *line =3D NULL;
> > +     size_t line_len =3D 0;
> > +     ssize_t nread;
> > +     int ret =3D -1;
> > +     char *config_detected =3D NULL;
> > +     static const char srcdir[] =3D "srcdir_SQ";
> > +
> > +     if (asprintf(&config_detected, "%s.config-detected", exec_path) <=
 0)
> > +             return -1;
> > +
> > +     file =3D fopen(config_detected, "r");
> > +     if (!file)
> > +             goto out;
> > +
> > +     while (!feof(file)) {
> > +             nread =3D getline(&line, &line_len, file);
> > +             if (nread < 0)
> > +                     break;
> > +
> > +             if (!strncmp(line, srcdir, sizeof(srcdir) - 1)) {
> > +
> > +                     if (line[nread - 1] =3D=3D '\n')
> > +                             line[nread - 1] =3D 0;
> > +
> > +                     if (asprintf(strp, "%s/Documentation", &line[size=
of(srcdir)]) !=3D -1)
> > +                             ret =3D 0;
> > +
> > +                     break;
> > +             }
> > +     }
> > +
> > +     fclose(file);
> > +out:
> > +     free(line);
> > +     free(config_detected);
> > +     return ret;
> > +}
>
> it's lot of tricky code because of one file, how about we compile
> tips.txt in perf binary directly? it might be even less code changes

I'm not sure about changes size, but anyway i agree that it makes more
sense to compile tips.txt in perf binary.

________________________________________
From: Jiri Olsa <jolsa@redhat.com>
Sent: 09 April 2021 17:11
To: Denys Zagorui -X (dzagorui - GLOBALLOGIC INC at Cisco)
Cc: linux-kernel@vger.kernel.org; peterz@infradead.org; mingo@redhat.com; a=
cme@kernel.org; mark.rutland@arm.com; alexander.shishkin@linux.intel.com; n=
amhyung@kernel.org
Subject: Re: [PATCH v3] perf: build reproducibility improvements

On Thu, Apr 08, 2021 at 05:51:35AM -0700, Denys Zagorui wrote:
> This patch helps to make perf build more reproducible
>
> It seems there is some need to have an ability to invoke
> perf from build directory without installation
> (84cfac7f05e1: perf tools: Set and pass DOCDIR to builtin-report.c)
> DOCDIR contains an absolute path to kernel source directory.
> This path can be read from .config-detected that is stored in the
> same dir as perf executable.
>
> There is also python binding test where PYTHONPATH is used to store
> absolute path to python/perf.so library. This path can be
> also determined in runtime.
>
> bison stores full paths in generated files. This can be
> remapped by using --file-prefix-map option that is available
> starting from version 3.7.1.
>
> Signed-off-by: Denys Zagorui <dzagorui@cisco.com>
> ---
>  tools/perf/Build              |  1 -
>  tools/perf/Makefile.config    |  9 +++++
>  tools/perf/builtin-report.c   | 13 +++++++-
>  tools/perf/tests/Build        |  2 +-
>  tools/perf/tests/python-use.c | 14 +++++++-
>  tools/perf/util/Build         |  6 ++--
>  tools/perf/util/util.c        | 62 +++++++++++++++++++++++++++++++++++
>  tools/perf/util/util.h        |  5 +++
>  8 files changed, 105 insertions(+), 7 deletions(-)
>
> diff --git a/tools/perf/Build b/tools/perf/Build
> index db61dbe2b543..56d0189f1029 100644
> --- a/tools/perf/Build
> +++ b/tools/perf/Build
> @@ -45,7 +45,6 @@ CFLAGS_perf.o              +=3D -DPERF_HTML_PATH=3D"BUI=
LD_STR($(htmldir_SQ))"   \
>                             -DPREFIX=3D"BUILD_STR($(prefix_SQ))"
>  CFLAGS_builtin-trace.o          +=3D -DSTRACE_GROUPS_DIR=3D"BUILD_STR($(=
STRACE_GROUPS_DIR_SQ))"
>  CFLAGS_builtin-report.o         +=3D -DTIPDIR=3D"BUILD_STR($(tipdir_SQ))=
"
> -CFLAGS_builtin-report.o         +=3D -DDOCDIR=3D"BUILD_STR($(srcdir_SQ)/=
Documentation)"
>
>  perf-y +=3D util/
>  perf-y +=3D arch/
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index d8e59d31399a..2035bae6d5c5 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -195,6 +195,12 @@ ifeq ($(call get-executable,$(BISON)),)
>    dummy :=3D $(error Error: $(BISON) is missing on this system, please i=
nstall it)
>  endif
>
> +ifneq ($(OUTPUT),)
> +  ifeq ($(shell expr $(shell $(BISON) --version | grep bison | sed -e 's=
/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \>\=3D 371), 1)
> +    BISON_FILE_PREFIX_MAP :=3D --file-prefix-map=3D$(OUTPUT)=3D
> +  endif
> +endif

please move all the flex, tips and python changes into separate patches

SNIP

> index 98c6d474aa6f..930aa4c6264e 100644
> --- a/tools/perf/tests/python-use.c
> +++ b/tools/perf/tests/python-use.c
> @@ -8,16 +8,28 @@
>  #include <linux/compiler.h>
>  #include "tests.h"
>  #include "util/debug.h"
> +#include "util/util.h"
>
>  int test__python_use(struct test *test __maybe_unused, int subtest __may=
be_unused)
>  {
>       char *cmd;
>       int ret;
> +     char *exec_path;
> +     char *pythonpath;
> +
> +     exec_path =3D perf_exe_path();
> +     if (exec_path =3D=3D NULL)
> +             return -1;
> +
> +     if (asprintf(&pythonpath, "%spython", exec_path) < 0)
> +             return -1;

please check if the pythonpath exists and don't use it if does not..
with perf from rpm and python perf.so module the path is already there
so we don't care

SNIP

> +
> +int perf_src_doc(const char *exec_path, char **strp)
> +{
> +     FILE *file;
> +     char *line =3D NULL;
> +     size_t line_len =3D 0;
> +     ssize_t nread;
> +     int ret =3D -1;
> +     char *config_detected =3D NULL;
> +     static const char srcdir[] =3D "srcdir_SQ";
> +
> +     if (asprintf(&config_detected, "%s.config-detected", exec_path) < 0=
)
> +             return -1;
> +
> +     file =3D fopen(config_detected, "r");
> +     if (!file)
> +             goto out;
> +
> +     while (!feof(file)) {
> +             nread =3D getline(&line, &line_len, file);
> +             if (nread < 0)
> +                     break;
> +
> +             if (!strncmp(line, srcdir, sizeof(srcdir) - 1)) {
> +
> +                     if (line[nread - 1] =3D=3D '\n')
> +                             line[nread - 1] =3D 0;
> +
> +                     if (asprintf(strp, "%s/Documentation", &line[sizeof=
(srcdir)]) !=3D -1)
> +                             ret =3D 0;
> +
> +                     break;
> +             }
> +     }
> +
> +     fclose(file);
> +out:
> +     free(line);
> +     free(config_detected);
> +     return ret;
> +}

it's lot of tricky code because of one file, how about we compile
tips.txt in perf binary directly? it might be even less code changes

thanks,
jirka