Re: [XEN PATCH v2 2/2] coverage: update gcov info for newer versions of gcc

[Javi Merino <javi.merino@xxxxxxxxx>]

On Mon, Sep 11, 2023 at 10:00:14AM +0200, Jan Beulich wrote:
> On 08.09.2023 18:20, Javi Merino wrote:
> > Shamelessly copy changes to gcov_info structures from linux so that we
> > can capture coverage for xen built with newer compilers.
> > 
> > Signed-off-by: Javi Merino <javi.merino@xxxxxxxxx>
> > ---
> >  xen/common/coverage/gcc_4_7.c | 24 +++++++++++++++++++++---
> >  1 file changed, 21 insertions(+), 3 deletions(-)
> > 
> > diff --git a/xen/common/coverage/gcc_4_7.c b/xen/common/coverage/gcc_4_7.c
> > index ddbc9f4bb0..8f6e287474 100644
> > --- a/xen/common/coverage/gcc_4_7.c
> > +++ b/xen/common/coverage/gcc_4_7.c
> > @@ -24,14 +24,23 @@
> >  #define GCOV_COUNTERS 9
> >  #elif GCC_VERSION >= 50000 && GCC_VERSION < 70000
> >  #define GCOV_COUNTERS 10
> > -#elif GCC_VERSION >= 70000
> > +#elif GCC_VERSION >= 70000 && GCC_VERSION < 100000
> >  #define GCOV_COUNTERS 9
> > +#elif GCC_VERSION >= 100000
> > +#define GCOV_COUNTERS 8
> >  #else
> >  #error "Wrong version of GCC used to compile gcov"
> >  #endif
> 
> This would need adjustment if patch 1 is adjusted as suggested, then ...
> 
> >  #define GCOV_TAG_FUNCTION_LENGTH        3
> >  
> > +#if GCC_VERSION >= 120000
> > +/* Since GCC 12.1, sizes are in BYTES and not in WORDS (4B). */
> > +#define GCOV_UNIT_SIZE 4
> > +#else
> > +#define GCOV_UNIT_SIZE 1
> > +#endif
> 
> ... making the earlier group also match this one (which already works
> downwards in version number space).

True

> As to the comments (here and below): Since the version check is for
> 12.0, may I suggest to simply say "gcc 12" everywhere?
> 
> > @@ -89,6 +98,10 @@ struct gcov_info {
> >      unsigned int version;
> >      struct gcov_info *next;
> >      unsigned int stamp;
> > +#if (GCC_VERSION >= 120000)
> 
> Nit: Here any below parentheses likely want omitting, to match there
> being none further up. Preferably with the adjustments (which again
> I'd be okay doing while committing, so long as you agree)
> Acked-by: Jan Beulich <jbeulich@xxxxxxxx>

I'm ok with those changes and I'm fine with you doing them.

Cheers,
Javi