Hip wrapper

cc.sh

@@ -298,47 +298,40 @@ mode=""
 vdep=""
 lang_flags=""
 debug_flags=""
-command="${0##*/}"
 comp="CC"
 vcheck_flags=""
+
+command="${0##*/}"
+
+# -x/--language overrides the language implied by argv0.  Note that this is
+# only applied for compiler drivers: for ld, -x means --discard-all, and for
+# cpp, changing the language must not turn preprocessing into compilation.
+_command_from_flags() {
+    _lang=""
+    while [ $# -ne 0 ]; do
+        arg="$1"
+        shift
+        case "$arg" in
+            -x|--language)
+                [ $# -ne 0 ] || break
+                _lang="$1"
+                shift ;;
+            -x*)
+                _lang="${arg#-x}" ;;
+            --language=*)
+                _lang="${arg#--language=}" ;;
+            # we're only looking for lang args here: ignore everything else
+        esac
+    done
+
+    case "$_lang" in
+        c) command=cc ;;
+        c++|f77|f95|hip) command="$_lang" ;;
+        # anything else: keep the language implied by argv0
+    esac
+}
+
 case "$command" in
-    cpp)
-        mode=cpp
-        debug_flags="-g"
-        vcheck_flags="${SPACK_ALWAYS_CPPFLAGS}"
-        ;;
-    cc|c89|c99|gcc|clang|armclang|icc|icx|pgcc|nvc|xlc|xlc_r|fcc|amdclang|cl.exe|craycc)
-        command="$SPACK_CC"
-        vdep=c
-        comp="CC"
-        lang_flags=C
-        debug_flags="-g"
-        vcheck_flags="${SPACK_ALWAYS_CFLAGS}"
-        ;;
-    c++|CC|g++|clang++|armclang++|icpc|icpx|pgc++|nvc++|xlc++|xlc++_r|FCC|amdclang++|crayCC)
-        command="$SPACK_CXX"
-        vdep=cxx
-        comp="CXX"
-        lang_flags=CXX
-        debug_flags="-g"
-        vcheck_flags="${SPACK_ALWAYS_CXXFLAGS}"
-        ;;
-    ftn|f90|fc|f95|gfortran|flang|armflang|ifort|ifx|pgfortran|nvfortran|xlf90|xlf90_r|nagfor|frt|amdflang|crayftn)
-        command="$SPACK_FC"
-        vdep=fortran
-        comp="FC"
-        lang_flags=F
-        debug_flags="-g"
-        vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
-        ;;
-    f77|xlf|xlf_r|pgf77)
-        command="$SPACK_F77"
-        vdep=fortran
-        comp="F77"
-        lang_flags=F
-        debug_flags="-g"
-        vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
-        ;;
     ld|ld.gold|ld.lld)
         mode=ld
         if [ -z "$SPACK_CC_RPATH_ARG" ]; then
@@ -351,8 +344,58 @@ case "$command" in
 	        fi
         fi
         ;;
+    cpp)
+        mode=cpp
+        debug_flags="-g"
+        vcheck_flags="${SPACK_ALWAYS_CPPFLAGS}"
+        ;;
     *)
-        die "Unknown compiler: $command"
+        _command_from_flags "$@"
+        case "$command" in
+            cc|c89|c99|gcc|clang|armclang|icc|icx|pgcc|nvc|xlc|xlc_r|fcc|amdclang|cl.exe|craycc)
+                command="$SPACK_CC"
+                vdep=c
+                comp="CC"
+                lang_flags=C
+                debug_flags="-g"
+                vcheck_flags="${SPACK_ALWAYS_CFLAGS}"
+                ;;
+            c++|CC|g++|clang++|armclang++|icpc|icpx|pgc++|nvc++|xlc++|xlc++_r|FCC|amdclang++|crayCC)
+                command="$SPACK_CXX"
+                vdep=cxx
+                comp="CXX"
+                lang_flags=CXX
+                debug_flags="-g"
+                vcheck_flags="${SPACK_ALWAYS_CXXFLAGS}"
+                ;;
+            ftn|f90|fc|f95|gfortran|flang|armflang|ifort|ifx|pgfortran|nvfortran|xlf90|xlf90_r|nagfor|frt|amdflang|crayftn)
+                command="$SPACK_FC"
+                vdep=fortran
+                comp="FC"
+                lang_flags=F
+                debug_flags="-g"
+                vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
+                ;;
+            f77|xlf|xlf_r|pgf77)
+                command="$SPACK_F77"
+                vdep=fortran
+                comp="F77"
+                lang_flags=F
+                debug_flags="-g"
+                vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
+                ;;
+            hip|spackhip)
+                command="$SPACK_HIPCXX"
+                vdep="hip-lang"
+                comp="HIPCXX"
+                lang_flags=HIP
+                debug_flags="-g"
+                vcheck_flags="${SPACK_ALWAYS_HIPFLAGS}"
+                ;;
+            *)
+                die "Unknown compiler: $command"
+                ;;
+        esac
         ;;
 esac
 
@@ -791,6 +834,10 @@ case "$mode" in
                 extend spack_flags_list SPACK_CXXFLAGS
                 preextend flags_list SPACK_TARGET_ARGS_CXX
                 ;;
+            HIP)
+                extend spack_flags_list SPACK_ALWAYS_HIPFLAGS
+                extend spack_flags_list SPACK_HIPFLAGS
+                ;;
             F)
                 preextend flags_list SPACK_TARGET_ARGS_FORTRAN
                 ;;