gdb.rocm: replace hipcc with amdclang++ as the HIP compiler

Author: spatrang

gdb/doc/gdb.texinfo

@@ -29155,7 +29155,7 @@ to compile a HIP program that can utilize ``Vega 10'' and ``Vega 7nm''
 @acronym{AMD GPU} devices, with no optimization:
 
 @smallexample
-hipcc -O0 -g --offload-arch=gfx900 --offload-arch=gfx906 bit_extract.cpp -o bit_extract
+amdclang++ -x hip --hip-link -O0 -g --offload-arch=gfx900 --offload-arch=gfx906 bit_extract.cpp -o bit_extract
 @end smallexample
 
 The @acronym{AMD ROCm} compiler maps HIP source language device

gdb/testsuite/boards/hip.exp

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file is a dejagnu "board file" and is used to run the testsuite
-# against C/C++ device code compiled with hipcc.
+# against C/C++ device code compiled with amdclang++ (HIP).
 #
 # Example usage:
 #  bash$ make check RUNTESTFLAGS='--target_board=hip'
@@ -80,8 +80,8 @@ load_lib rocm.exp
 load_generic_config "unix"
 process_multilib_options ""
 
-set_board_info compiler [find_hipcc]
-set_board_info c++compiler [find_hipcc]
+set_board_info compiler [find_hip_compiler]
+set_board_info c++compiler [find_hip_compiler]
 
 set_board_info gdb,cannot_call_functions 1
 
@@ -149,10 +149,15 @@ proc skip_opencl_tests {} {
 # Yup, we don't want to run the gdb.rocm/ tests against this board.
 # That would be kind of recursive.  Those tests really expect that
 # "main()" is host code and start kernels themselves.
-proc allow_hipcc_tests {} {
+proc allow_hip_tests {} {
     return 0
 }
 
+# Backwards compatibility alias.
+proc allow_hipcc_tests {} {
+    return [allow_hip_tests]
+}
+
 # Override this to fail faster.  If we let the default run, tests
 # compile successfully, but fail at link time.
 proc gdb_compile_pthreads {source dest type options} {
@@ -271,10 +276,10 @@ proc gdb_compile {source dest type options} {
 
 	# We need:
 	#
-	# . explicit -O0, because hipcc optimizes by default.
+	# . explicit -O0, because the HIP compiler optimizes by default.
 	#
-	# . -std=gnu++11 because hipcc defaults to -std=c++11, and
-	#   some testcases assume GNU extensions.
+	# . -std=gnu++11 because the HIP compiler defaults to -std=c++11,
+	#   and some testcases assume GNU extensions.
 	#
 	# . -fgpu-rdc enables separate compilation mode, so we can
 	#   compile the kernel from multiple translation units.
@@ -303,7 +308,7 @@ proc gdb_compile {source dest type options} {
 	} elseif {[info exists CC_FOR_TARGET]} {
 	    set compiler $CC_FOR_TARGET
 	}
-	if {[string first "hipcc" $compiler] != -1} {
+	if {[string first "amdclang++" $compiler] != -1} {
 
 	    # Remove "c++" from the options when linking, otherwise we
 	    # would get:

gdb/testsuite/gdb.perf/rocm-break-cond-false.exp

@@ -22,7 +22,7 @@
 load_lib rocm.exp
 load_lib perftest.exp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 standard_testfile .cpp
 

gdb/testsuite/gdb.rocm/addr-bp-gpu-no-deb-info.exp

@@ -20,7 +20,7 @@ load_lib rocm.exp
 
 standard_testfile .cpp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 if {[build_executable "failed to prepare" $testfile $srcfile {hip}]} {
     return

gdb/testsuite/gdb.rocm/alu-exceptions.exp

@@ -21,7 +21,7 @@
 
 load_lib rocm.exp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 standard_testfile .cpp
 

gdb/testsuite/gdb.rocm/aspace-user-input.exp

@@ -21,7 +21,7 @@
 
 load_lib rocm.exp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 standard_testfile bit-extract.cpp
 

gdb/testsuite/gdb.rocm/aspace-watchpoint.exp

@@ -24,7 +24,7 @@
 
 load_lib rocm.exp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 standard_testfile .cpp
 

gdb/testsuite/gdb.rocm/bit-extract.exp

@@ -18,7 +18,7 @@
 
 load_lib rocm.exp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 standard_testfile .cpp
 

gdb/testsuite/gdb.rocm/branch-fault.exp

@@ -21,7 +21,7 @@
 
 load_lib rocm.exp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 standard_testfile .cpp
 

gdb/testsuite/gdb.rocm/break-kernel-no-debug-info.exp

@@ -25,7 +25,7 @@ load_lib rocm.exp
 
 standard_testfile .cpp
 
-require allow_hipcc_tests
+require allow_hip_tests
 
 # Build for hip, explicitly without debug infos
 if {[build_executable "failed to prepare" $testfile $srcfile {hip nodebug}]} {