From b4d4603df3fed290ccf721899be6bc69f037fe2b Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 14 Feb 2023 18:57:04 +0100 Subject: [PATCH] 'libgomp.c/usm-{1,2,3,4}.c': Re-enable non-GCN offloading compilation Change '-foffload=amdgcn-amdhsa=[...]' to '-foffload-options=amdgcn-amdhsa=[...]', so that non-GCN offloading compilation doesn't get disabled. Fix-up for og12 commit 6ec2c29dbbc19e7d2a8f991a5848e10c65c7c74c "amdgcn, libgomp: USM allocation update". libgomp/ * testsuite/libgomp.c/usm-1.c: Re-enable non-GCN offloading compilation. * testsuite/libgomp.c/usm-2.c: Likewise. * testsuite/libgomp.c/usm-3.c: Likewise. * testsuite/libgomp.c/usm-4.c: Likewise. --- libgomp/ChangeLog.omp | 8 ++++++++ libgomp/testsuite/libgomp.c/usm-1.c | 2 +- libgomp/testsuite/libgomp.c/usm-2.c | 2 +- libgomp/testsuite/libgomp.c/usm-3.c | 2 +- libgomp/testsuite/libgomp.c/usm-4.c | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 2a20516cd09..ecc14b4f537 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,11 @@ +2023-02-16 Thomas Schwinge + + * testsuite/libgomp.c/usm-1.c: Re-enable non-GCN offloading + compilation. + * testsuite/libgomp.c/usm-2.c: Likewise. + * testsuite/libgomp.c/usm-3.c: Likewise. + * testsuite/libgomp.c/usm-4.c: Likewise. + 2023-02-16 Tobias Burnus Backported from master: diff --git a/libgomp/testsuite/libgomp.c/usm-1.c b/libgomp/testsuite/libgomp.c/usm-1.c index f7bf897b839..35f37de7542 100644 --- a/libgomp/testsuite/libgomp.c/usm-1.c +++ b/libgomp/testsuite/libgomp.c/usm-1.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include diff --git a/libgomp/testsuite/libgomp.c/usm-2.c b/libgomp/testsuite/libgomp.c/usm-2.c index 3f52adbd7e1..783075edb54 100644 --- a/libgomp/testsuite/libgomp.c/usm-2.c +++ b/libgomp/testsuite/libgomp.c/usm-2.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include diff --git a/libgomp/testsuite/libgomp.c/usm-3.c b/libgomp/testsuite/libgomp.c/usm-3.c index 225cba5fe58..733f0f34090 100644 --- a/libgomp/testsuite/libgomp.c/usm-3.c +++ b/libgomp/testsuite/libgomp.c/usm-3.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include diff --git a/libgomp/testsuite/libgomp.c/usm-4.c b/libgomp/testsuite/libgomp.c/usm-4.c index d4addfc587a..5bf99df3b24 100644 --- a/libgomp/testsuite/libgomp.c/usm-4.c +++ b/libgomp/testsuite/libgomp.c/usm-4.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include -- 2.25.1