Hi!
On 2022-09-28T10:39:59-0500, Segher Boessenkool <seg...@kernel.crashing.org>
wrote:
> On Wed, Sep 28, 2022 at 03:12:23PM +0100, Jonathan Wakely wrote:
>> Which version of Dejagnu are you using? There was a fix in 6.1 or 6.2
(1.6.1, 1.6.2.)
>> to change the order that the RUNTESTFLAGS and dg-options get added to
>> the command line.
Ah, right,
<http://git.savannah.gnu.org/gitweb/?p=dejagnu.git;a=commit;h=5256bd82343000c76bc0e48139003f90b6184347>...
However, that was not the problem here -- I'd been using such a DejaGnu
version. That was strange, so I dug deeper, and found: in our *local*
DejaGnu board files a '[...]_target_compile' proc that likewise did need
to be fixed... :-| With that done, the problem is then gone.
(I'm anyways attaching my "[WIP] nvptx: '-mdejagnu-ptx'", in case that's
ever useful for anyone, but not proposing to push that one.)
>> It's a pain to make the testsuite work consistently for both old and
>> new versions. I would be very happy if we just said you need a modern
>> version of Dejagnu, and relied on the semantics in the newer versions.
>
> Unfortunately there quite often are bugs in newer versions of DejaGnu
> as well, making it impossible to require very new versions of it.
The "require a more recent version of DejaGnu" discussion never gets old,
eh... ;-P
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634
München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas
Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht
München, HRB 106955
>From 3ce58c891359cd439518786448fd21a94c5a70a4 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Wed, 28 Sep 2022 22:14:55 +0200
Subject: [PATCH] [WIP] nvptx: '-mdejagnu-ptx'
Similar to 'gcc/config/rs6000/rs6000.h:DRIVER_SELF_SPECS'.
---
gcc/config/nvptx/nvptx.h | 9 +++++++++
gcc/testsuite/gcc.target/nvptx/atomic-store-1.c | 2 +-
gcc/testsuite/gcc.target/nvptx/atomic-store-2.c | 2 +-
gcc/testsuite/gcc.target/nvptx/float16-1.c | 2 +-
gcc/testsuite/gcc.target/nvptx/float16-2.c | 2 +-
gcc/testsuite/gcc.target/nvptx/float16-3.c | 2 +-
gcc/testsuite/gcc.target/nvptx/float16-4.c | 2 +-
gcc/testsuite/gcc.target/nvptx/float16-5.c | 2 +-
gcc/testsuite/gcc.target/nvptx/float16-6.c | 2 +-
gcc/testsuite/gcc.target/nvptx/nvptx.exp | 4 ++--
gcc/testsuite/gcc.target/nvptx/ptx31.c | 2 +-
gcc/testsuite/gcc.target/nvptx/ptx60.c | 2 +-
gcc/testsuite/gcc.target/nvptx/ptx63.c | 2 +-
gcc/testsuite/gcc.target/nvptx/ptx70.c | 2 +-
gcc/testsuite/gcc.target/nvptx/sm53.c | 2 +-
gcc/testsuite/gcc.target/nvptx/sm70.c | 2 +-
gcc/testsuite/gcc.target/nvptx/sm75.c | 2 +-
gcc/testsuite/gcc.target/nvptx/sm80.c | 2 +-
gcc/testsuite/gcc.target/nvptx/tanh-1.c | 2 +-
gcc/testsuite/gcc.target/nvptx/uniform-simt-1.c | 2 +-
gcc/testsuite/gcc.target/nvptx/uniform-simt-2.c | 2 +-
gcc/testsuite/gcc.target/nvptx/uniform-simt-3.c | 2 +-
gcc/testsuite/gcc.target/nvptx/uniform-simt-4.c | 2 +-
libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c | 2 +-
libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c | 2 +-
libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c | 2 +-
libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c | 2 +-
libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c | 2 +-
libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c | 2 +-
libgomp/testsuite/libgomp.c/reverse-offload-sm30.c | 2 +-
30 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/gcc/config/nvptx/nvptx.h b/gcc/config/nvptx/nvptx.h
index 0afc83b10a3..b015182a7d8 100644
--- a/gcc/config/nvptx/nvptx.h
+++ b/gcc/config/nvptx/nvptx.h
@@ -27,6 +27,15 @@
/* Run-time Target. */
+/* Only for use in the testsuite: -mdejagnu-ptx=<value> filters out all
+ -mptx= options then simply adds -mptx=<value>.
+ With older versions of Dejagnu the command line arguments you set in
+ RUNTESTFLAGS override those set in the testcases; with these options,
+ the testcase will always win. */
+#define DRIVER_SELF_SPECS \
+ "%{mdejagnu-ptx=*: %<mptx=* -mptx=%*}", \
+ "%{mdejagnu-*: %<mdejagnu-*}"
+
/* Use '--with-arch' for default '-misa'. */
#define OPTION_DEFAULT_SPECS \
{ "arch", "%{!misa=*:-misa=%(VALUE)}" }, \
diff --git a/gcc/testsuite/gcc.target/nvptx/atomic-store-1.c b/gcc/testsuite/gcc.target/nvptx/atomic-store-1.c
index eecd00854f7..a81f96acc08 100644
--- a/gcc/testsuite/gcc.target/nvptx/atomic-store-1.c
+++ b/gcc/testsuite/gcc.target/nvptx/atomic-store-1.c
@@ -2,7 +2,7 @@
shared state space. */
/* { dg-do compile } */
-/* { dg-options "-misa=sm_53 -mptx=_" } */
+/* { dg-options "-misa=sm_53 -mdejagnu-ptx=_" } */
enum memmodel
{
diff --git a/gcc/testsuite/gcc.target/nvptx/atomic-store-2.c b/gcc/testsuite/gcc.target/nvptx/atomic-store-2.c
index 127d2c4cbe2..d5f89256857 100644
--- a/gcc/testsuite/gcc.target/nvptx/atomic-store-2.c
+++ b/gcc/testsuite/gcc.target/nvptx/atomic-store-2.c
@@ -2,7 +2,7 @@
shared state space. */
/* { dg-do compile } */
-/* { dg-options "-misa=sm_70 -mptx=_" } */
+/* { dg-options "-misa=sm_70 -mdejagnu-ptx=_" } */
enum memmodel
{
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-1.c b/gcc/testsuite/gcc.target/nvptx/float16-1.c
index 017774c2941..d59dcc264a9 100644
--- a/gcc/testsuite/gcc.target/nvptx/float16-1.c
+++ b/gcc/testsuite/gcc.target/nvptx/float16-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ffast-math -misa=sm_53 -mptx=_" } */
+/* { dg-options "-O2 -ffast-math -misa=sm_53 -mdejagnu-ptx=_" } */
/* { dg-additional-options "-mexperimental" } */
_Float16 var;
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-2.c b/gcc/testsuite/gcc.target/nvptx/float16-2.c
index e15b685253b..46a6895b703 100644
--- a/gcc/testsuite/gcc.target/nvptx/float16-2.c
+++ b/gcc/testsuite/gcc.target/nvptx/float16-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ffast-math -misa=sm_80 -mptx=_" } */
+/* { dg-options "-O2 -ffast-math -misa=sm_80 -mdejagnu-ptx=_" } */
/* { dg-additional-options "-mexperimental" } */
_Float16 x;
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-3.c b/gcc/testsuite/gcc.target/nvptx/float16-3.c
index 1c646902055..c4ca7dff3d7 100644
--- a/gcc/testsuite/gcc.target/nvptx/float16-3.c
+++ b/gcc/testsuite/gcc.target/nvptx/float16-3.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -misa=sm_53 -mptx=_" } */
+/* { dg-options "-O2 -misa=sm_53 -mdejagnu-ptx=_" } */
/* { dg-additional-options "-mexperimental" } */
_Float16 var;
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-4.c b/gcc/testsuite/gcc.target/nvptx/float16-4.c
index 1c24ec8c3b2..09687aab63b 100644
--- a/gcc/testsuite/gcc.target/nvptx/float16-4.c
+++ b/gcc/testsuite/gcc.target/nvptx/float16-4.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ffast-math -misa=sm_53 -mptx=_" } */
+/* { dg-options "-O2 -ffast-math -misa=sm_53 -mdejagnu-ptx=_" } */
/* { dg-additional-options "-mexperimental" } */
_Float16 var;
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-5.c b/gcc/testsuite/gcc.target/nvptx/float16-5.c
index 9ae3365e1a6..f3960f9634c 100644
--- a/gcc/testsuite/gcc.target/nvptx/float16-5.c
+++ b/gcc/testsuite/gcc.target/nvptx/float16-5.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ffast-math -misa=sm_53 -mptx=_" } */
+/* { dg-options "-O2 -ffast-math -misa=sm_53 -mdejagnu-ptx=_" } */
/* { dg-additional-options "-mexperimental" } */
_Float16 a;
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-6.c b/gcc/testsuite/gcc.target/nvptx/float16-6.c
index 37c580429c5..452dc501ada 100644
--- a/gcc/testsuite/gcc.target/nvptx/float16-6.c
+++ b/gcc/testsuite/gcc.target/nvptx/float16-6.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -misa=sm_53 -mptx=_" } */
+/* { dg-options "-O2 -misa=sm_53 -mdejagnu-ptx=_" } */
/* { dg-additional-options "-mexperimental" } */
_Float16 x;
diff --git a/gcc/testsuite/gcc.target/nvptx/nvptx.exp b/gcc/testsuite/gcc.target/nvptx/nvptx.exp
index e9622ae7aaa..15a8a8b1000 100644
--- a/gcc/testsuite/gcc.target/nvptx/nvptx.exp
+++ b/gcc/testsuite/gcc.target/nvptx/nvptx.exp
@@ -60,7 +60,7 @@ proc check_effective_target_runtime_ptx_isa_version_at_least { major minor } {
if { $default } {
set flag ""
} else {
- set flag "-mptx=$major.$minor"
+ set flag "-mdejagnu-ptx=$major.$minor"
}
set res [check_runtime $name {
@@ -80,7 +80,7 @@ proc add_options_for_ptx_alias { flags } {
append flags " -malias"
if { ![check_effective_target_default_ptx_isa_version_at_least 6 3] } {
- append flags " -mptx=6.3"
+ append flags " -mdejagnu-ptx=6.3"
}
return $flags
diff --git a/gcc/testsuite/gcc.target/nvptx/ptx31.c b/gcc/testsuite/gcc.target/nvptx/ptx31.c
index 46b5e1ba405..89ec9adfd34 100644
--- a/gcc/testsuite/gcc.target/nvptx/ptx31.c
+++ b/gcc/testsuite/gcc.target/nvptx/ptx31.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-march=sm_30 -mptx=3.1" } */
+/* { dg-options "-march=sm_30 -mdejagnu-ptx=3.1" } */
#if __PTX_ISA_VERSION_MAJOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MAJOR__
diff --git a/gcc/testsuite/gcc.target/nvptx/ptx60.c b/gcc/testsuite/gcc.target/nvptx/ptx60.c
index 267a9c64f1e..17fd935b676 100644
--- a/gcc/testsuite/gcc.target/nvptx/ptx60.c
+++ b/gcc/testsuite/gcc.target/nvptx/ptx60.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-march=sm_30 -mptx=6.0" } */
+/* { dg-options "-march=sm_30 -mdejagnu-ptx=6.0" } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
diff --git a/gcc/testsuite/gcc.target/nvptx/ptx63.c b/gcc/testsuite/gcc.target/nvptx/ptx63.c
index 13d02e132ae..af55b3c5c08 100644
--- a/gcc/testsuite/gcc.target/nvptx/ptx63.c
+++ b/gcc/testsuite/gcc.target/nvptx/ptx63.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-march=sm_30 -mptx=6.3" } */
+/* { dg-options "-march=sm_30 -mdejagnu-ptx=6.3" } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
diff --git a/gcc/testsuite/gcc.target/nvptx/ptx70.c b/gcc/testsuite/gcc.target/nvptx/ptx70.c
index 15df13604bd..61bcc6bc92a 100644
--- a/gcc/testsuite/gcc.target/nvptx/ptx70.c
+++ b/gcc/testsuite/gcc.target/nvptx/ptx70.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-march=sm_30 -mptx=7.0" } */
+/* { dg-options "-march=sm_30 -mdejagnu-ptx=7.0" } */
#if __PTX_ISA_VERSION_MAJOR__ != 7
#error wrong value for __PTX_ISA_VERSION_MAJOR__
diff --git a/gcc/testsuite/gcc.target/nvptx/sm53.c b/gcc/testsuite/gcc.target/nvptx/sm53.c
index b4d819c6a79..bd24880bcae 100644
--- a/gcc/testsuite/gcc.target/nvptx/sm53.c
+++ b/gcc/testsuite/gcc.target/nvptx/sm53.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-misa=sm_53 -mptx=_" } */
+/* { dg-options "-misa=sm_53 -mdejagnu-ptx=_" } */
#if __PTX_SM__ != 530
#error wrong value for __PTX_SM__
diff --git a/gcc/testsuite/gcc.target/nvptx/sm70.c b/gcc/testsuite/gcc.target/nvptx/sm70.c
index 4bd012b5680..50d7eacdc48 100644
--- a/gcc/testsuite/gcc.target/nvptx/sm70.c
+++ b/gcc/testsuite/gcc.target/nvptx/sm70.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-misa=sm_70 -mptx=_" } */
+/* { dg-options "-misa=sm_70 -mdejagnu-ptx=_" } */
#if __PTX_SM__ != 700
#error wrong value for __PTX_SM__
diff --git a/gcc/testsuite/gcc.target/nvptx/sm75.c b/gcc/testsuite/gcc.target/nvptx/sm75.c
index d159d3f5fb3..38b06430666 100644
--- a/gcc/testsuite/gcc.target/nvptx/sm75.c
+++ b/gcc/testsuite/gcc.target/nvptx/sm75.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-misa=sm_75 -mptx=_" } */
+/* { dg-options "-misa=sm_75 -mdejagnu-ptx=_" } */
#if __PTX_SM__ != 750
#error wrong value for __PTX_SM__
diff --git a/gcc/testsuite/gcc.target/nvptx/sm80.c b/gcc/testsuite/gcc.target/nvptx/sm80.c
index ef6d8b7fa23..1e3df05afc0 100644
--- a/gcc/testsuite/gcc.target/nvptx/sm80.c
+++ b/gcc/testsuite/gcc.target/nvptx/sm80.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-misa=sm_80 -mptx=_" } */
+/* { dg-options "-misa=sm_80 -mdejagnu-ptx=_" } */
#if __PTX_SM__ != 800
#error wrong value for __PTX_SM__
diff --git a/gcc/testsuite/gcc.target/nvptx/tanh-1.c b/gcc/testsuite/gcc.target/nvptx/tanh-1.c
index 534846cd62d..ff4c6d1b008 100644
--- a/gcc/testsuite/gcc.target/nvptx/tanh-1.c
+++ b/gcc/testsuite/gcc.target/nvptx/tanh-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -ffast-math -misa=sm_75 -mptx=_" } */
+/* { dg-options "-O2 -ffast-math -misa=sm_75 -mdejagnu-ptx=_" } */
float foo(float x)
{
diff --git a/gcc/testsuite/gcc.target/nvptx/uniform-simt-1.c b/gcc/testsuite/gcc.target/nvptx/uniform-simt-1.c
index fc225764e6b..c47f3d0262d 100644
--- a/gcc/testsuite/gcc.target/nvptx/uniform-simt-1.c
+++ b/gcc/testsuite/gcc.target/nvptx/uniform-simt-1.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -muniform-simt -misa=sm_70 -mptx=_" } */
+/* { dg-options "-O2 -muniform-simt -misa=sm_70 -mdejagnu-ptx=_" } */
enum memmodel
{
diff --git a/gcc/testsuite/gcc.target/nvptx/uniform-simt-2.c b/gcc/testsuite/gcc.target/nvptx/uniform-simt-2.c
index b1eee0d618f..6f2eebd81b7 100644
--- a/gcc/testsuite/gcc.target/nvptx/uniform-simt-2.c
+++ b/gcc/testsuite/gcc.target/nvptx/uniform-simt-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -muniform-simt -mptx=3.1 -misa=sm_30" } */
+/* { dg-options "-O2 -muniform-simt -mdejagnu-ptx=3.1 -misa=sm_30" } */
enum memmodel
{
diff --git a/gcc/testsuite/gcc.target/nvptx/uniform-simt-3.c b/gcc/testsuite/gcc.target/nvptx/uniform-simt-3.c
index f539cd3cafc..e9f5faef96c 100644
--- a/gcc/testsuite/gcc.target/nvptx/uniform-simt-3.c
+++ b/gcc/testsuite/gcc.target/nvptx/uniform-simt-3.c
@@ -1,4 +1,4 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -muniform-simt -misa=sm_70 -mptx=_" } */
+/* { dg-options "-O2 -muniform-simt -misa=sm_70 -mdejagnu-ptx=_" } */
#include "atomic-store-2.c"
diff --git a/gcc/testsuite/gcc.target/nvptx/uniform-simt-4.c b/gcc/testsuite/gcc.target/nvptx/uniform-simt-4.c
index c33de7a4111..7c5b9cda1cf 100644
--- a/gcc/testsuite/gcc.target/nvptx/uniform-simt-4.c
+++ b/gcc/testsuite/gcc.target/nvptx/uniform-simt-4.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -muniform-simt -mptx=_" } */
+/* { dg-options "-O2 -muniform-simt -mdejagnu-ptx=_" } */
enum memmodel
{
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c
index a49bc12064a..367c1cc138d 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c
@@ -1,5 +1,5 @@
/* { dg-do run { target { offload_target_nvptx } } } */
-/* { dg-additional-options "-foffload=-misa=sm_30 -foffload=-mptx=_" } */
+/* { dg-additional-options "-foffload=-misa=sm_30 -foffload=-mdejagnu-ptx=_" } */
/* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
#include "declare-variant-3.h"
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c
index 9f71acb8738..23f979ca268 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c
@@ -1,5 +1,5 @@
/* { dg-do link { target { offload_target_nvptx } } } */
-/* { dg-additional-options "-foffload=-misa=sm_35 -foffload=-mptx=_" } */
+/* { dg-additional-options "-foffload=-misa=sm_35 -foffload=-mdejagnu-ptx=_" } */
/* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
#include "declare-variant-3.h"
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c
index fa713920ce0..d2b44d6e0d0 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c
@@ -1,5 +1,5 @@
/* { dg-do link { target { offload_target_nvptx } } } */
-/* { dg-additional-options "-foffload=-misa=sm_53 -foffload=-mptx=_" } */
+/* { dg-additional-options "-foffload=-misa=sm_53 -foffload=-mdejagnu-ptx=_" } */
/* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
#include "declare-variant-3.h"
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c
index 90f0116c582..d4fc436276e 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c
@@ -1,5 +1,5 @@
/* { dg-do link { target { offload_target_nvptx } } } */
-/* { dg-additional-options "-foffload=-misa=sm_70 -foffload=-mptx=_" } */
+/* { dg-additional-options "-foffload=-misa=sm_70 -foffload=-mdejagnu-ptx=_" } */
/* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
#include "declare-variant-3.h"
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c
index 86f2e72866a..069a9470e72 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c
@@ -1,5 +1,5 @@
/* { dg-do link { target { offload_target_nvptx } } } */
-/* { dg-additional-options "-foffload=-misa=sm_75 -foffload=-mptx=_" } */
+/* { dg-additional-options "-foffload=-misa=sm_75 -foffload=-mdejagnu-ptx=_" } */
/* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
#include "declare-variant-3.h"
diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c
index de208d9bdd1..3a61dfe9535 100644
--- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c
+++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c
@@ -1,5 +1,5 @@
/* { dg-do link { target { offload_target_nvptx } } } */
-/* { dg-additional-options "-foffload=-misa=sm_80 -foffload=-mptx=_" } */
+/* { dg-additional-options "-foffload=-misa=sm_80 -foffload=-mdejagnu-ptx=_" } */
/* { dg-additional-options "-foffload=-fdump-tree-optimized" } */
#include "declare-variant-3.h"
diff --git a/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c b/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c
index fbfeae1fd41..e4f07069293 100644
--- a/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c
+++ b/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c
@@ -1,5 +1,5 @@
/* { dg-do link { target { offload_target_nvptx } } } */
-/* { dg-additional-options "-foffload-options=nvptx-none=-march=sm_30 -foffload=-mptx=_" } */
+/* { dg-additional-options "-foffload-options=nvptx-none=-march=sm_30 -foffload=-mdejagnu-ptx=_" } */
#pragma omp requires reverse_offload
--
2.35.1
