From d02972a2dab719f00520ab07476d11340cf76192 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 4 Jul 2022 21:42:42 +0200 Subject: [PATCH] gcn/t-omp-device: Add 'amdgcn' as 'arch' [PR105602] Improve cross-compiler handling. gcc/ChangeLog: PR target/105602 * config/gcn/t-omp-device (arch): Add 'amdgcn' besides existing 'gcn'. * config/gcn/gcn.cc (gcn_omp_device_kind_arch_isa): Likewise. (cherry picked from commit ebe5dace8c318b38f42cfe1d148e90dcdfadb31e) --- gcc/ChangeLog.omp | 9 +++++++++ gcc/config/gcn/gcn.cc | 2 +- gcc/config/gcn/t-omp-device | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 1c4634d09abe..e146e14e6f8e 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,12 @@ +2022-07-04 Tobias Burnus + + Backport from mainline: + 2022-05-17 Tobias Burnus + + PR target/105602 + * config/gcn/t-omp-device (arch): Add 'amdgcn' besides existing 'gcn'. + * config/gcn/gcn.cc (gcn_omp_device_kind_arch_isa): Likewise. + 2022-07-04 Tobias Burnus Backport from mainline: diff --git a/gcc/config/gcn/gcn.cc b/gcc/config/gcn/gcn.cc index 98e563054366..d963231fd501 100644 --- a/gcc/config/gcn/gcn.cc +++ b/gcc/config/gcn/gcn.cc @@ -2667,7 +2667,7 @@ gcn_omp_device_kind_arch_isa (enum omp_device_kind_arch_isa trait, case omp_device_kind: return strcmp (name, "gpu") == 0; case omp_device_arch: - return strcmp (name, "gcn") == 0; + return strcmp (name, "amdgcn") == 0 || strcmp (name, "gcn") == 0; case omp_device_isa: if (strcmp (name, "fiji") == 0) return gcn_arch == PROCESSOR_FIJI; diff --git a/gcc/config/gcn/t-omp-device b/gcc/config/gcn/t-omp-device index 1086cefb0a29..27d36db894be 100644 --- a/gcc/config/gcn/t-omp-device +++ b/gcc/config/gcn/t-omp-device @@ -1,4 +1,4 @@ omp-device-properties-gcn: $(srcdir)/config/gcn/gcn.cc echo kind: gpu > $@ - echo arch: gcn >> $@ + echo arch: amdgcn gcn >> $@ echo isa: fiji gfx900 gfx906 gfx908 gfx90a >> $@ -- 2.47.2