updates AMD HIP card options

Author: danielpeter

Makefile.in

@@ -260,18 +260,23 @@ GENCODE_90 = -gencode=arch=compute_90,code=\"sm_90,compute_90\"
 # Radeon Instinct MI50:  --amdgpu-target=gfx906
 # Radeon Instinct MI100: --amdgpu-target=gfx908
 # Radeon Instinct MI210/250/250X: --amdgpu-target=gfx90a
+# Instinct MI300X/300A/325X: --amdgpu-target=gfx942
+# Instinct MI350X/355X: --amdgpu-target=gfx950
 GENCODE_AMD_MI8 = --amdgpu-target=gfx803
 GENCODE_AMD_MI25 = --amdgpu-target=gfx900
 GENCODE_AMD_MI50 = --amdgpu-target=gfx906
 GENCODE_AMD_MI100 = --amdgpu-target=gfx908
 GENCODE_AMD_MI250 = --amdgpu-target=gfx90a
+GENCODE_AMD_MI300 = --amdgpu-target=gfx942
+GENCODE_AMD_MI325 = --amdgpu-target=gfx942
+GENCODE_AMD_MI350 = --amdgpu-target=gfx950
 
 # default targets
-# AMD default MI50 & MI100
-@COND_HIP_TRUE@@COND_HIP_PLATFORM_AMD_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI50) $(GENCODE_AMD_MI100)
+# AMD default MI250 & MI300
+@COND_HIP_TRUE@@COND_HIP_PLATFORM_AMD_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI250) $(GENCODE_AMD_MI300)
 @COND_HIP_TRUE@@COND_HIP_PLATFORM_AMD_TRUE@HIP_CFLAG_ENDING = -x hip
-# NVIDIA default Tesla
-@COND_HIP_TRUE@@COND_HIP_PLATFORM_NVIDIA_TRUE@GENCODE_HIP = $(GENCODE_30)
+# NVIDIA default Turing
+@COND_HIP_TRUE@@COND_HIP_PLATFORM_NVIDIA_TRUE@GENCODE_HIP = $(GENCODE_75)
 @COND_HIP_TRUE@@COND_HIP_PLATFORM_NVIDIA_TRUE@HIP_CFLAG_ENDING =      # no need for ending
 # CPU
 @COND_HIP_TRUE@@COND_HIP_PLATFORM_CPU_TRUE@GENCODE_HIP =           		# no card specifics
@@ -283,6 +288,9 @@ GENCODE_AMD_MI250 = --amdgpu-target=gfx90a
 @COND_HIP_TRUE@@COND_HIP_MI50_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI50)    # --with-hip=MI50 ..
 @COND_HIP_TRUE@@COND_HIP_MI100_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI100)  # --with-hip=MI100 ..
 @COND_HIP_TRUE@@COND_HIP_MI250_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI250)  # --with-hip=MI250 ..
+@COND_HIP_TRUE@@COND_HIP_MI300_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI300)  # --with-hip=MI300 ..
+@COND_HIP_TRUE@@COND_HIP_MI325_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI325)  # --with-hip=MI325 ..
+@COND_HIP_TRUE@@COND_HIP_MI350_TRUE@GENCODE_HIP = $(GENCODE_AMD_MI350)  # --with-hip=MI350 ..
 
 @COND_HIP_TRUE@@COND_HIP_CUDA5_TRUE@GENCODE_HIP = $(GENCODE_35)         # --with-hip=cuda5 ..
 @COND_HIP_TRUE@@COND_HIP_CUDA6_TRUE@GENCODE_HIP = $(GENCODE_37)         # --with-hip=cuda6 ..

configure

@@ -764,6 +764,12 @@ COND_HIP_CUDA6_FALSE
 COND_HIP_CUDA6_TRUE
 COND_HIP_CUDA5_FALSE
 COND_HIP_CUDA5_TRUE
+COND_HIP_MI350_FALSE
+COND_HIP_MI350_TRUE
+COND_HIP_MI325_FALSE
+COND_HIP_MI325_TRUE
+COND_HIP_MI300_FALSE
+COND_HIP_MI300_TRUE
 COND_HIP_MI250_FALSE
 COND_HIP_MI250_TRUE
 COND_HIP_MI100_FALSE
@@ -3599,6 +3605,30 @@ else
   COND_HIP_MI250_FALSE=
 fi
 
+ if test x"$want_hip" = xMI300; then
+  COND_HIP_MI300_TRUE=
+  COND_HIP_MI300_FALSE='#'
+else
+  COND_HIP_MI300_TRUE='#'
+  COND_HIP_MI300_FALSE=
+fi
+
+ if test x"$want_hip" = xMI325; then
+  COND_HIP_MI325_TRUE=
+  COND_HIP_MI325_FALSE='#'
+else
+  COND_HIP_MI325_TRUE='#'
+  COND_HIP_MI325_FALSE=
+fi
+
+ if test x"$want_hip" = xMI350; then
+  COND_HIP_MI350_TRUE=
+  COND_HIP_MI350_FALSE='#'
+else
+  COND_HIP_MI350_TRUE='#'
+  COND_HIP_MI350_FALSE=
+fi
+
 
  if test x"$want_hip" = xcuda5; then
   COND_HIP_CUDA5_TRUE=
@@ -12374,6 +12404,18 @@ if test -z "${COND_HIP_MI250_TRUE}" && test -z "${COND_HIP_MI250_FALSE}"; then
   as_fn_error $? "conditional \"COND_HIP_MI250\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${COND_HIP_MI300_TRUE}" && test -z "${COND_HIP_MI300_FALSE}"; then
+  as_fn_error $? "conditional \"COND_HIP_MI300\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_HIP_MI325_TRUE}" && test -z "${COND_HIP_MI325_FALSE}"; then
+  as_fn_error $? "conditional \"COND_HIP_MI325\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_HIP_MI350_TRUE}" && test -z "${COND_HIP_MI350_FALSE}"; then
+  as_fn_error $? "conditional \"COND_HIP_MI350\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${COND_HIP_CUDA5_TRUE}" && test -z "${COND_HIP_CUDA5_FALSE}"; then
   as_fn_error $? "conditional \"COND_HIP_CUDA5\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

@@ -144,6 +144,9 @@ AM_CONDITIONAL([COND_HIP_MI25], [test x"$want_hip" = xMI25])
 AM_CONDITIONAL([COND_HIP_MI50], [test x"$want_hip" = xMI50])
 AM_CONDITIONAL([COND_HIP_MI100], [test x"$want_hip" = xMI100])
 AM_CONDITIONAL([COND_HIP_MI250], [test x"$want_hip" = xMI250])
+AM_CONDITIONAL([COND_HIP_MI300], [test x"$want_hip" = xMI300])
+AM_CONDITIONAL([COND_HIP_MI325], [test x"$want_hip" = xMI325])
+AM_CONDITIONAL([COND_HIP_MI350], [test x"$want_hip" = xMI350])
 
 AM_CONDITIONAL([COND_HIP_CUDA5], [test x"$want_hip" = xcuda5])
 AM_CONDITIONAL([COND_HIP_CUDA6], [test x"$want_hip" = xcuda6])