From 7d3e6498955d22bef49023ec6fb1dac38a30afb4 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Sat, 19 Feb 2022 23:33:27 +0100
Subject: [PATCH] [nvptx, testsuite] Remove mptx settings in gcc.target/nvptx
 tests

Some test-cases in gcc/testsuite/gcc.target/nvptx contain mptx
settings, which are paired with misa settings, in order to have the mptx
version support the misa version.

Since commit decde11183bd ("[nvptx] Choose -mptx default based on -misa"),
this is no longer necessary.

Remove the mptx settings.

Tested on nvptx.

gcc/testsuite/ChangeLog:

2022-02-20  Tom de Vries  <tdevries@suse.de>

	* gcc.target/nvptx/float16-1.c: Drop -mptx setting.
	* gcc.target/nvptx/float16-2.c: Same.
	* gcc.target/nvptx/float16-3.c: Same.
	* gcc.target/nvptx/float16-4.c: Same.
	* gcc.target/nvptx/float16-5.c: Same.
	* gcc.target/nvptx/float16-6.c: Same.
	* gcc.target/nvptx/tanh-1.c: Same.
---
 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/tanh-1.c    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gcc/testsuite/gcc.target/nvptx/float16-1.c b/gcc/testsuite/gcc.target/nvptx/float16-1.c
index 3a0324d..9c3f8fe 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 -misa=sm_53 -mptx=6.3 -ffast-math" } */
+/* { dg-options "-O2 -misa=sm_53 -ffast-math" } */
 
 _Float16 var;
 
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-2.c b/gcc/testsuite/gcc.target/nvptx/float16-2.c
index 5748a9c..2d1dc1a 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=7.0" } */
+/* { dg-options "-O2 -ffast-math -misa=sm_80" } */
 
 _Float16 x;
 _Float16 y;
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-3.c b/gcc/testsuite/gcc.target/nvptx/float16-3.c
index 914282a..3abcec3 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=6.3" } */
+/* { dg-options "-O2 -misa=sm_53" } */
 
 _Float16 var;
 
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-4.c b/gcc/testsuite/gcc.target/nvptx/float16-4.c
index b11f17a..173f960 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 -misa=sm_53 -mptx=6.3 -ffast-math" } */
+/* { dg-options "-O2 -misa=sm_53 -ffast-math" } */
 
 _Float16 var;
 
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-5.c b/gcc/testsuite/gcc.target/nvptx/float16-5.c
index 5fe15ec..700b315 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 -misa=sm_53 -mptx=6.3 -ffast-math" } */
+/* { dg-options "-O2 -misa=sm_53 -ffast-math" } */
 
 _Float16 a;
 _Float16 b;
diff --git a/gcc/testsuite/gcc.target/nvptx/float16-6.c b/gcc/testsuite/gcc.target/nvptx/float16-6.c
index 8fe4fa3..4889577 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=6.3" } */
+/* { dg-options "-O2 -misa=sm_53" } */
 
 _Float16 x;
 _Float16 y;
diff --git a/gcc/testsuite/gcc.target/nvptx/tanh-1.c b/gcc/testsuite/gcc.target/nvptx/tanh-1.c
index 56a0e5a..946b8c1 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=7.0" } */
+/* { dg-options "-O2 -ffast-math -misa=sm_75" } */
 
 float foo(float x)
 {
-- 
2.7.4