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 --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 2f931af7425c9ddb7afb0a17727bcacaf5282a16..dd3b0e1e029ac810cdb430b32a888c859e7f91ce 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,12 @@
+2025-03-25  Thomas Schwinge  <tschwinge@baylibre.com>
+
+       Backported from trunk:
+       2025-03-24  Thomas Schwinge  <tschwinge@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  <parras@baylibre.com>
 
        Backported from master:

diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index 6dd358bf3d584c5ed95c447f4bbc70f03ad9e0b6..6ebc2d627eebc05a6a9b56b6310e0d0108e76d58 100644 (file)
--- 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 c32a44e9cb3b849b8b26b40afe1435bb35fdc7dc..9b39a75986918c3b2d4ff0a986105ed65f1d496f 100644 (file)
--- 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 ca18867353601f7e2ae2dbea23b2a37c703cbd24..2437f76e75538acf610cc86029e03ffcebc0dffe 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,5 +1,17 @@
 2025-03-25  Thomas Schwinge  <tschwinge@baylibre.com>
 
+       Backported from trunk:
+       2025-03-24  Thomas Schwinge  <tschwinge@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  <tschwinge@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 b69926e6debccb96b9b4d5e73ad0777b089aa160..b5e2c19b07c99aa55196366ee7d1fe9085870485 100644 (file)
--- 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 dcf9e05233fa8b1ee02ecc6c0f826cc635073130..9a066bb52f4bb7cc01d78df56ae8fc5852b6e85e 100644 (file)
--- 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 ce4669053ab5ea8b3705fc7f76574c058d1f3399..15f5faeb1c68b2605018ae35eca73063a76354c4 100644 (file)
--- 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 5b7f31c323052681d70a37562b26fb13abd8d187..2a29377ba15da6c22dbc3a2ac7a3368fdf11f340 100644 (file)
--- 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 934dd535cf370b858e44e5be8c87439980ba88e8..5bb73bce549e12024d427e87bc85d9b501974988 100644 (file)
--- 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 a362935f3827d2e7bc5eb0b20d464da6914f6d6e..23e09bebfd1bc535d2e5c3aa72bf2f5e97da89b2 100644 (file)
--- 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 c9e92261b0e98fb607ca90866ad80c2df925b8eb..9f9f1dfece07302a1dc929c3e8fcd64b7dd21605 100644 (file)
--- 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 d1094d0b9179032a390f6c005f9fd60a4b39e08d..5644861b39857db674daa6ddf559514ffdb6d7e9 100644 (file)
--- 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