RE: [PATCH] gdb/testsuite: Always close '-x hip' with '-x none' (was: Re: [PATCH v2] gdb/testsuite: replace hipcc with amdclang++ as the HIP compiler)

["Six, Lancelot" <Lancelot.Six@amd.com>]

AMD General

>
> So we get instead:
>
>   clang++ \
>     -x hip \
>     .../device_enumerator.cpp \               << affected by -x hip
>     -x none \                                 << new
>     .../set_unbuffered_mode_saved.o \         << under -x none
>     .../windows-manifest.o \                  << under -x none
>     -o .../temp/4415
>
> ... which compiles & links fine.
>
> Change-Id: I49ab369ebba1d638f61a73673b25ffc35305875b

Hi,

This looks reasonable to me, thanks for fixing this.

Approved-by: Lancelot Six <lancelot.six@amd.com> (amdgpu)

Best,
Lancelot.

> ---
>  gdb/testsuite/lib/gdb.exp | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
> index b66e501d08d..1c02b0fa918 100644
> --- a/gdb/testsuite/lib/gdb.exp
> +++ b/gdb/testsuite/lib/gdb.exp
> @@ -7129,17 +7129,24 @@ proc gdb_compile {source dest type options} {
>      # archives, shared libraries), so the compiler does not try to
>      # parse those as HIP source.  This lets a single amdclang++
>      # invocation correctly handle a mix of sources and non-source
> -    # inputs (e.g. when set_unbuffered_mode.o is appended via ldflags
> -    # later in the command line).
> +    # inputs.
>      if {[lsearch -exact $options hip] != -1 && !$getting_compiler_info} {
>         set new_source {}
> +       set x_lang ""
>         foreach src $source {
>             set ext [string tolower [file extension $src]]
>             if {$ext in {".c" ".cc" ".cp" ".cxx" ".cpp" ".c++" ".hip"}} {
> -               lappend new_source "-x" "hip" $src
> +               set x_lang "hip"
>             } else {
> -               lappend new_source "-x" "none" $src
> +               set x_lang "none"
>             }
> +           lappend new_source "-x" $x_lang $src
> +       }
> +       # Make sure that if we last opened "-x hip", we close it off
> +       # with "-x none", in case something adds some input file via
> +       # ldflags (e.g. set_unbuffered_mode.o).
> +       if {$x_lang != "" && $x_lang != "none"} {
> +           lappend new_source "-x" "none"
>         }
>         set source $new_source
>      }
>
> base-commit: 97feaffb829a5fcf404d2d093062758123e8795f
> --
> 2.54.0
>