From b4d4603df3fed290ccf721899be6bc69f037fe2b Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
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(-)
@@ -1,3 +1,11 @@
+2023-02-16 Thomas Schwinge <thomas@codesourcery.com>
+
+ * 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 <tobias@codesourcery.com>
Backported from master:
@@ -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 <omp.h>
#include <stdint.h>
@@ -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 <omp.h>
#include <stdint.h>
@@ -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 <omp.h>
#include <stdint.h>
@@ -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 <omp.h>
#include <stdint.h>
--
2.25.1