From: Andrew Stubbs <ams@codesourcery.com>
Date: Tue, 21 Dec 2021 10:09:08 +0000 (+0000)
Subject: nvptx: bump default to PTX 4.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f702eb7ad1e50bc3ca37e247d8097a8b15d5606;p=thirdparty%2Fgcc.git

nvptx: bump default to PTX 4.1

gcc/ChangeLog:

	* config/nvptx/nvptx-opts.h (ptx_version): Change PTX_VERSION_3_1 to
	PTX_VERSION_4_1.
	* config/nvptx/nvptx.c (nvptx_file_start): Bump minimum PTX version
	to 4.1.
	* config/nvptx/nvptx.opt (ptx_version): Add 4.1. Change default.
	doc/invoke.texi: -mptx default is now 4.1.
---

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 5c1a09d05c82..012cc52a9e06 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,12 @@
+2021-12-22  Andrew Stubbs  <ams@codesourcery.com>
+
+	* config/nvptx/nvptx-opts.h (ptx_version): Change PTX_VERSION_3_1 to
+	PTX_VERSION_4_1.
+	* config/nvptx/nvptx.c (nvptx_file_start): Bump minimum PTX version
+	to 4.1.
+	* config/nvptx/nvptx.opt (ptx_version): Add 4.1. Change default.
+	doc/invoke.texi: -mptx default is now 4.1.
+
 2021-11-02  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backport from master:
diff --git a/gcc/config/nvptx/nvptx-opts.h b/gcc/config/nvptx/nvptx-opts.h
index bfa926ef0f78..75e75164e24d 100644
--- a/gcc/config/nvptx/nvptx-opts.h
+++ b/gcc/config/nvptx/nvptx-opts.h
@@ -28,7 +28,7 @@ enum ptx_isa
 
 enum ptx_version
 {
-  PTX_VERSION_3_1,
+  PTX_VERSION_4_1,
   PTX_VERSION_6_3
 };
 
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index 15f6fc821328..5437b12c9253 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -4832,7 +4832,7 @@ nvptx_file_start (void)
   if (TARGET_PTX_6_3)
     fputs ("\t.version\t6.3\n", asm_out_file);
   else
-    fputs ("\t.version\t3.1\n", asm_out_file);
+    fputs ("\t.version\t4.1\n", asm_out_file);
   if (TARGET_SM35)
     fputs ("\t.target\tsm_35\n", asm_out_file);
   else
diff --git a/gcc/config/nvptx/nvptx.opt b/gcc/config/nvptx/nvptx.opt
index 468c6cafd571..521b8ea0645b 100644
--- a/gcc/config/nvptx/nvptx.opt
+++ b/gcc/config/nvptx/nvptx.opt
@@ -70,12 +70,16 @@ Enum
 Name(ptx_version) Type(int)
 Known PTX versions (for use with the -mptx= option):
 
+; Keep 3.1 for backwards compatibility only
 EnumValue
-Enum(ptx_version) String(3.1) Value(PTX_VERSION_3_1)
+Enum(ptx_version) String(3.1) Value(PTX_VERSION_4_1)
+
+EnumValue
+Enum(ptx_version) String(4.1) Value(PTX_VERSION_4_1)
 
 EnumValue
 Enum(ptx_version) String(6.3) Value(PTX_VERSION_6_3)
 
 mptx=
-Target RejectNegative ToLower Joined Enum(ptx_version) Var(ptx_version_option) Init(PTX_VERSION_3_1)
+Target RejectNegative ToLower Joined Enum(ptx_version) Var(ptx_version_option) Init(PTX_VERSION_4_1)
 Specify the version of the ptx version to use.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index ef55ee595fc4..5f32d3e23f21 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -26423,8 +26423,8 @@ strings must be lower-case.  Valid ISA strings include @samp{sm_30} and
 @item -mptx=@var{version-string}
 @opindex mptx
 Generate code for given the specified PTX version (e.g.@: @samp{6.3}).
-Valid version strings include @samp{3.1} and @samp{6.3}.  The default PTX
-version is 3.1.
+Valid version strings include @samp{4.1} and @samp{6.3}.  The default PTX
+version is 4.1.
 
 @item -mmainkernel
 @opindex mmainkernel