procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nvptx: Support '-mptx=4.1'

Browse source 
gcc/
	* config/nvptx/nvptx-opts.h (enum ptx_version): Add
	'PTX_VERSION_4_1'.
	* config/nvptx/nvptx.cc (ptx_version_to_string)
	(ptx_version_to_number): Adjust.
	* config/nvptx/nvptx.h (TARGET_PTX_4_1): New.
	* config/nvptx/nvptx.opt (Enum(ptx_version)): Add 'EnumValue'
	'4.1' for 'PTX_VERSION_4_1'.
	* doc/invoke.texi (Nvidia PTX Options): Document '-mptx=4.1'.
	gcc/testsuite/
	* gcc.target/nvptx/mptx=4.1.c: New.
This commit is contained in:
Thomas Schwinge 2024-11-10 17:34:08 +01:00
parent 1af83aa099
commit 18d80e5ecf
6 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/config/nvptx/nvptx-opts.h
View file

@ -38,6 +38,7 @@ enum ptx_version
PTX_VERSION_unset,
PTX_VERSION_default = PTX_VERSION_unset,
PTX_VERSION_3_1,
PTX_VERSION_4_1,
PTX_VERSION_4_2,
PTX_VERSION_6_0,
PTX_VERSION_6_3,

4
gcc/config/nvptx/nvptx.cc
View file

@ -252,6 +252,8 @@ ptx_version_to_string (enum ptx_version v)
{
case PTX_VERSION_3_1:
return "3.1";
case PTX_VERSION_4_1:
return "4.1";
case PTX_VERSION_4_2:
return "4.2";
case PTX_VERSION_6_0:
@ -272,6 +274,8 @@ ptx_version_to_number (enum ptx_version v, bool major_p)
{
case PTX_VERSION_3_1:
return major_p ? 3 : 1;
case PTX_VERSION_4_1:
return major_p ? 4 : 1;
case PTX_VERSION_4_2:
return major_p ? 4 : 2;
case PTX_VERSION_6_0:

1
gcc/config/nvptx/nvptx.h
View file

@ -90,6 +90,7 @@
/* There are no 'TARGET_PTX_3_1' and smaller conditionals: our baseline is
PTX ISA Version 3.1. */
#define TARGET_PTX_4_1 (ptx_version_option >= PTX_VERSION_4_1)
#define TARGET_PTX_4_2 (ptx_version_option >= PTX_VERSION_4_2)
#define TARGET_PTX_6_0 (ptx_version_option >= PTX_VERSION_6_0)
#define TARGET_PTX_6_3 (ptx_version_option >= PTX_VERSION_6_3)

3
gcc/config/nvptx/nvptx.opt
View file

@ -127,6 +127,9 @@ Known PTX ISA versions (for use with the -mptx= option):
EnumValue
Enum(ptx_version) String(3.1) Value(PTX_VERSION_3_1)
EnumValue
Enum(ptx_version) String(4.1) Value(PTX_VERSION_4_1)
EnumValue
Enum(ptx_version) String(4.2) Value(PTX_VERSION_4_2)

2
gcc/doc/invoke.texi
View file

@ -30073,7 +30073,7 @@ capable. For instance, for @option{-march-map=sm_50} select
Generate code for the specified PTX ISA version.
Valid version strings are
@samp{3.1},
@samp{4.2},
@samp{4.1}, @samp{4.2},
@samp{6.0}, @samp{6.3},
and @samp{7.0}.
The default PTX ISA version is 6.0, unless a higher

19
gcc/testsuite/gcc.target/nvptx/mptx=4.1.c Normal file
View file

@ -0,0 +1,19 @@
/* { dg-do assemble } */
/* { dg-options {-march=sm_30 -mptx=4.1} } */
/* { dg-additional-options -save-temps } */
/* { dg-final { scan-assembler-times {(?n)^ \.version 4\.1$} 1 } } */
/* { dg-final { scan-assembler-times {(?n)^ \.target sm_30$} 1 } } */
#if __PTX_ISA_VERSION_MAJOR__ != 4
#error wrong value for __PTX_ISA_VERSION_MAJOR__
#endif
#if __PTX_ISA_VERSION_MINOR__ != 1
#error wrong value for __PTX_ISA_VERSION_MINOR__
#endif
#if __PTX_SM__ != 300
#error wrong value for __PTX_SM__
#endif
int dummy;