Add -march=gfx906 for AMD GCN.

2019-09-06  Andrew Stubbs  <ams@codesourcery.com>

	Backport from mainline:

	2019-06-06  Andrew Stubbs  <ams@codesourcery.com>

	gcc/
	* config.gcc (amdgcn-*-*): Allow --with-arch=gfx906.
	* config/gcn/gcn.opt (gpu_type): Add gfx906.
	* config/gcn/t-gcn-hsa (MULTILIB_OPTIONS): Add gfx906 multilib.
	(MULTILIB_DIRNAMES): Rename gcn5 to gfx900.
	Add gfx906.

	2019-06-07  Andrew Stubbs  <ams@codesourcery.com>

	gcc/
	* doc/invoke.texi (AMD GCN Options): Add gfx906.

(cherry picked from openacc-gcc-9-branch commit
dd55735f6fc79b7f673dda6429a270aa0e63151b)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 02667a2aed4be3b91c9f2428fe74977c234df6f8..80550f77448f015789de25306c2e7c92ef19a1bd 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,19 @@
+2019-09-06  Andrew Stubbs  <ams@codesourcery.com>
+
+       Backport from mainline:
+
+       2019-06-06  Andrew Stubbs  <ams@codesourcery.com>
+
+       * config.gcc (amdgcn-*-*): Allow --with-arch=gfx906.
+       * config/gcn/gcn.opt (gpu_type): Add gfx906.
+       * config/gcn/t-gcn-hsa (MULTILIB_OPTIONS): Add gfx906 multilib.
+       (MULTILIB_DIRNAMES): Rename gcn5 to gfx900.
+       Add gfx906.
+
+       2019-06-07  Andrew Stubbs  <ams@codesourcery.com>
+
+       * doc/invoke.texi (AMD GCN Options): Add gfx906.
+
 2019-09-06  Julian Brown  <julian@codesourcery.com>
 
        * gimplify.c (gimplify_omp_for): Use for_stmt in call to

diff --git a/gcc/config/gcn/gcn.opt b/gcc/config/gcn/gcn.opt
index 2fd3996edbad89372979e178fc310279241b1a9e..bdc878f35ad4d3db336b1a247100b7eb41cb4fef 100644 (file)
--- a/gcc/config/gcn/gcn.opt
+++ b/gcc/config/gcn/gcn.opt
@@ -34,6 +34,9 @@ Enum(gpu_type) String(fiji) Value(PROCESSOR_FIJI)
 EnumValue
 Enum(gpu_type) String(gfx900) Value(PROCESSOR_VEGA)
 
+EnumValue
+Enum(gpu_type) String(gfx906) Value(PROCESSOR_VEGA)
+
 march=
 Target RejectNegative Joined ToLower Enum(gpu_type) Var(gcn_arch) Init(PROCESSOR_CARRIZO)
 Specify the name of the target GPU.

diff --git a/gcc/config/gcn/t-gcn-hsa b/gcc/config/gcn/t-gcn-hsa
index 085ba429c9d71fca3fdb2bdbd6bb4b203b905274..1600a586ac4d16a0fbce109d4e4ec8681a92037c 100644 (file)
--- a/gcc/config/gcn/t-gcn-hsa
+++ b/gcc/config/gcn/t-gcn-hsa
@@ -42,8 +42,8 @@ ALL_HOST_OBJS += gcn-run.o
 gcn-run$(exeext): gcn-run.o
        +$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $< -ldl
 
-MULTILIB_OPTIONS = march=gfx900
-MULTILIB_DIRNAMES = gcn5
+MULTILIB_OPTIONS = march=gfx900 march=gfx906
+MULTILIB_DIRNAMES = gfx900 gfx906
 
 PASSES_EXTRA += $(srcdir)/config/gcn/gcn-passes.def
 gcn-tree.o: $(srcdir)/config/gcn/gcn-tree.c

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 811252955f3ce3f9b7d03d30b938514b81e8d1a5..0be458ae2dcc968f50d85adac812d7a034b83679 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -16211,6 +16211,9 @@ Compile for GCN3 Fiji devices (gfx803).
 @item gfx900
 Compile for GCN5 Vega 10 devices (gfx900).
 
+@item gfx906
+Compile for GCN5 Vega 20 devices (gfx906).
+
 @end table
 
 @item -mstack-size=@var{bytes}