From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 849F0385C311; Mon, 4 Jul 2022 20:11:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 849F0385C311 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] gcn/t-omp-device: Add 'amdgcn' as 'arch' [PR105602] X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 3062a5dd41c05331cf37f4fc49f677c98cd1227e X-Git-Newrev: d02972a2dab719f00520ab07476d11340cf76192 Message-Id: <20220704201126.849F0385C311@sourceware.org> Date: Mon, 4 Jul 2022 20:11:26 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2022 20:11:26 -0000 https://gcc.gnu.org/g:d02972a2dab719f00520ab07476d11340cf76192 commit d02972a2dab719f00520ab07476d11340cf76192 Author: Tobias Burnus Date: Mon Jul 4 21:42:42 2022 +0200 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) Diff: --- 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 1c4634d09ab..e146e14e6f8 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 98e56305436..d963231fd50 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 1086cefb0a2..27d36db894b 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 >> $@