https://gcc.gnu.org/g:e052d4160675bab88f4ece1d228174298ff88e20
commit e052d4160675bab88f4ece1d228174298ff88e20
Author: Thomas Schwinge <tschwi...@baylibre.com>
Date: Thu Mar 20 14:21:26 2025 +0100
nvptx: Default at least to '-mptx=6.3'
gcc/
* config/nvptx/nvptx.cc (default_ptx_version_option): Default at
least to '-mptx=6.3'.
* doc/invoke.texi (Nvidia PTX Options): Update '-mptx=[...]'.
gcc/testsuite/
* gcc.target/nvptx/march-map=sm_30.c: Adjust.
* gcc.target/nvptx/march-map=sm_32.c: Likewise.
* gcc.target/nvptx/march-map=sm_35.c: Likewise.
* gcc.target/nvptx/march-map=sm_37.c: Likewise.
* gcc.target/nvptx/march-map=sm_50.c: Likewise.
* gcc.target/nvptx/march=sm_30.c: Likewise.
* gcc.target/nvptx/march=sm_35.c: Likewise.
* gcc.target/nvptx/march=sm_37.c: Likewise.
(cherry picked from commit 5450afcfb761834b7f4156022f1ec38f2226c193)
Diff:
---
gcc/ChangeLog.omp | 9 +++++++++
gcc/config/nvptx/nvptx.cc | 3 +++
gcc/doc/invoke.texi | 2 +-
gcc/testsuite/ChangeLog.omp | 12 ++++++++++++
gcc/testsuite/gcc.target/nvptx/march-map=sm_30.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/march-map=sm_32.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/march-map=sm_35.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/march-map=sm_37.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/march-map=sm_50.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/march=sm_30.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/march=sm_35.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/march=sm_37.c | 4 ++--
12 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 2f931af7425c..dd3b0e1e029a 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,12 @@
+2025-03-25 Thomas Schwinge <tschwi...@baylibre.com>
+
+ Backported from trunk:
+ 2025-03-24 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * config/nvptx/nvptx.cc (default_ptx_version_option): Default at
+ least to '-mptx=6.3'.
+ * doc/invoke.texi (Nvidia PTX Options): Update '-mptx=[...]'.
+
2025-03-21 Paul-Antoine Arras <par...@baylibre.com>
Backported from master:
diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index 6dd358bf3d58..6ebc2d627eeb 100644
--- a/gcc/config/nvptx/nvptx.cc
+++ b/gcc/config/nvptx/nvptx.cc
@@ -251,6 +251,9 @@ default_ptx_version_option (void)
warp convergence. */
res = MAX (res, PTX_VERSION_6_0);
+ /* Pick at least 6.3. */
+ res = MAX (res, PTX_VERSION_6_3);
+
/* For sm_52+, pick at least 7.3, to enable PTX 'alloca'. */
if (ptx_isa_option >= PTX_ISA_SM52)
res = MAX (res, PTX_VERSION_7_3);
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index c32a44e9cb3b..9b39a7598691 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -30062,7 +30062,7 @@ Valid version strings are
@samp{7.0}, @samp{7.3}, and @samp{7.8}.
The default PTX ISA version is the one that added support for the
selected PTX ISA target architecture, see @option{-march=}, but at
-least @samp{6.0}, or @samp{7.3} for @option{-march=sm_52} and higher.
+least @samp{6.3}, or @samp{7.3} for @option{-march=sm_52} and higher.
This option sets the values of the preprocessor macros
@code{__PTX_ISA_VERSION_MAJOR__} and @code{__PTX_ISA_VERSION_MINOR__};
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index ca1886735360..2437f76e7553 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,5 +1,17 @@
2025-03-25 Thomas Schwinge <tschwi...@baylibre.com>
+ Backported from trunk:
+ 2025-03-24 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * gcc.target/nvptx/march-map=sm_30.c: Adjust.
+ * gcc.target/nvptx/march-map=sm_32.c: Likewise.
+ * gcc.target/nvptx/march-map=sm_35.c: Likewise.
+ * gcc.target/nvptx/march-map=sm_37.c: Likewise.
+ * gcc.target/nvptx/march-map=sm_50.c: Likewise.
+ * gcc.target/nvptx/march=sm_30.c: Likewise.
+ * gcc.target/nvptx/march=sm_35.c: Likewise.
+ * gcc.target/nvptx/march=sm_37.c: Likewise.
+
Backported from trunk:
2025-03-21 Thomas Schwinge <tschwi...@baylibre.com>
diff --git a/gcc/testsuite/gcc.target/nvptx/march-map=sm_30.c
b/gcc/testsuite/gcc.target/nvptx/march-map=sm_30.c
index b69926e6debc..b5e2c19b07c9 100644
--- a/gcc/testsuite/gcc.target/nvptx/march-map=sm_30.c
+++ b/gcc/testsuite/gcc.target/nvptx/march-map=sm_30.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march-map=sm_30 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_30$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
diff --git a/gcc/testsuite/gcc.target/nvptx/march-map=sm_32.c
b/gcc/testsuite/gcc.target/nvptx/march-map=sm_32.c
index dcf9e05233fa..9a066bb52f4b 100644
--- a/gcc/testsuite/gcc.target/nvptx/march-map=sm_32.c
+++ b/gcc/testsuite/gcc.target/nvptx/march-map=sm_32.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march-map=sm_32 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_30$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
diff --git a/gcc/testsuite/gcc.target/nvptx/march-map=sm_35.c
b/gcc/testsuite/gcc.target/nvptx/march-map=sm_35.c
index ce4669053ab5..15f5faeb1c68 100644
--- a/gcc/testsuite/gcc.target/nvptx/march-map=sm_35.c
+++ b/gcc/testsuite/gcc.target/nvptx/march-map=sm_35.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march-map=sm_35 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_35$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
diff --git a/gcc/testsuite/gcc.target/nvptx/march-map=sm_37.c
b/gcc/testsuite/gcc.target/nvptx/march-map=sm_37.c
index 5b7f31c32305..2a29377ba15d 100644
--- a/gcc/testsuite/gcc.target/nvptx/march-map=sm_37.c
+++ b/gcc/testsuite/gcc.target/nvptx/march-map=sm_37.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march-map=sm_37 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_37$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
diff --git a/gcc/testsuite/gcc.target/nvptx/march-map=sm_50.c
b/gcc/testsuite/gcc.target/nvptx/march-map=sm_50.c
index 934dd535cf37..5bb73bce549e 100644
--- a/gcc/testsuite/gcc.target/nvptx/march-map=sm_50.c
+++ b/gcc/testsuite/gcc.target/nvptx/march-map=sm_50.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march-map=sm_50 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_37$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
diff --git a/gcc/testsuite/gcc.target/nvptx/march=sm_30.c
b/gcc/testsuite/gcc.target/nvptx/march=sm_30.c
index a362935f3827..23e09bebfd1b 100644
--- a/gcc/testsuite/gcc.target/nvptx/march=sm_30.c
+++ b/gcc/testsuite/gcc.target/nvptx/march=sm_30.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march=sm_30 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_30$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
diff --git a/gcc/testsuite/gcc.target/nvptx/march=sm_35.c
b/gcc/testsuite/gcc.target/nvptx/march=sm_35.c
index c9e92261b0e9..9f9f1dfece07 100644
--- a/gcc/testsuite/gcc.target/nvptx/march=sm_35.c
+++ b/gcc/testsuite/gcc.target/nvptx/march=sm_35.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march=sm_35 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_35$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
diff --git a/gcc/testsuite/gcc.target/nvptx/march=sm_37.c
b/gcc/testsuite/gcc.target/nvptx/march=sm_37.c
index d1094d0b9179..5644861b3985 100644
--- a/gcc/testsuite/gcc.target/nvptx/march=sm_37.c
+++ b/gcc/testsuite/gcc.target/nvptx/march=sm_37.c
@@ -1,14 +1,14 @@
/* { dg-do assemble } */
/* { dg-options {-march=sm_37 -mptx=_} } */
/* { dg-additional-options -save-temps } */
-/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.0$} 1 } } */
+/* { dg-final { scan-assembler-times {(?n)^ \.version 6\.3$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_37$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 6
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
-#if __PTX_ISA_VERSION_MINOR__ != 0
+#if __PTX_ISA_VERSION_MINOR__ != 3
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
