[gcc r12-7369] [nvptx] Add missing t-omp-device isas

[gcc r12-7369] [nvptx] Add missing t-omp-device isas

[Tom de Vries]

https://gcc.gnu.org/g:a046033ea0ba97314265933bc48124574db2d62a

commit r12-7369-ga046033ea0ba97314265933bc48124574db2d62a
Author: Tom de Vries <tdevries@suse.de>
Date:   Wed Feb 23 15:58:59 2022 +0100

    [nvptx] Add missing t-omp-device isas
    
    In t-omp-device we list isas that can be used in omp declare variant like so:
    ...
      #pragma omp declare variant (f30) match (device={isa("sm_30")})
    ...
    and in nvptx_omp_device_kind_arch_isa we handle them.
    
    Update both to reflect the current list of isas.
    
    Tested on x86_64-linux with nvptx accelerator.
    
    gcc/ChangeLog:
    
    2022-02-23  Tom de Vries  <tdevries@suse.de>
    
            * config/nvptx/nvptx.cc (nvptx_omp_device_kind_arch_isa): Handle
            sm_70, sm_75 and sm_80.
            * config/nvptx/t-omp-device: Add sm_53, sm_70, sm_75 and sm_80.
    
    Co-Authored-By: Tobias Burnus <tobias@codesourcery.com>

Diff:
---
 gcc/config/nvptx/nvptx.cc     | 8 +++++++-
 gcc/config/nvptx/t-omp-device | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index 6f6d592e462..b9451c2ed09 100644
--- a/gcc/config/nvptx/nvptx.cc
+++ b/gcc/config/nvptx/nvptx.cc
@@ -6181,7 +6181,13 @@ nvptx_omp_device_kind_arch_isa (enum omp_device_kind_arch_isa trait,
       if (strcmp (name, "sm_35") == 0)
 	return TARGET_SM35 && !TARGET_SM53;
       if (strcmp (name, "sm_53") == 0)
-	return TARGET_SM53;
+	return TARGET_SM53 && !TARGET_SM70;
+      if (strcmp (name, "sm_70") == 0)
+	return TARGET_SM70 && !TARGET_SM75;
+      if (strcmp (name, "sm_75") == 0)
+	return TARGET_SM75 && !TARGET_SM80;
+      if (strcmp (name, "sm_80") == 0)
+	return TARGET_SM80;
       return 0;
     default:
       gcc_unreachable ();
diff --git a/gcc/config/nvptx/t-omp-device b/gcc/config/nvptx/t-omp-device
index 8765d9f1881..4228218a424 100644
--- a/gcc/config/nvptx/t-omp-device
+++ b/gcc/config/nvptx/t-omp-device
@@ -1,4 +1,4 @@
 omp-device-properties-nvptx: $(srcdir)/config/nvptx/nvptx.cc
 	echo kind: gpu > $@
 	echo arch: nvptx >> $@
-	echo isa: sm_30 sm_35 >> $@
+	echo isa: sm_30 sm_35 sm_53 sm_70 sm_75 sm_80 >> $@