[nvptx] Ignore c++ exceptions

The nvptx port can't support exceptions using sjlj, because ptx does not
support sjlj.  However, default_except_unwind_info still returns UI_SJLJ, even
even if we configure with --disable-sjlj-exceptions, because UI_SJLJ is the
fallback option.

The reason default_except_unwind_info doesn't return UI_DWARF2 is because
DWARF2_UNWIND_INFO is not defined in defaults.h, because
INCOMING_RETURN_ADDR_RTX is not defined, because there's no ptx equivalent.

Testcase libgomp.c++/for-15.C currently doesn't compile unless fno-exceptions
is added because:
- it tries to generate sjlj exception handling code, and
- it tries to generate exception tables using label-addressed .byte sequence.
  Ptx doesn't support generating random data at a label, nor being able to
  load/write data relative to a label.

This patch fixes the first problem by using UI_TARGET for nvptx.

The second problem is worked around by generating all .byte sequences commented
out.  It would be better to have a narrower workaround, and define
TARGET_ASM_BYTE_OP to "error: .byte unsupported " or some such.

This patch does not enable exceptions for nvptx, it merely allows c++ programs
to run correctly if they do no use exception handling.

Build and reg-tested on x86_64 with nvptx accelerator.

2018-08-02  Tom de Vries  <tdevries@suse.de>

	PR target/86660
	* common/config/nvptx/nvptx-common.c (nvptx_except_unwind_info): New
	function.  Return UI_TARGET unconditionally.
	(TARGET_EXCEPT_UNWIND_INFO): Redefine to nvptx_except_unwind_info.
	* config/nvptx/nvptx.c (TARGET_ASM_BYTE_OP): Emit commented out '.byte'.

	* testsuite/libgomp.oacc-c++/routine-1-auto.C: Remove -fno-exceptions.
	* testsuite/libgomp.oacc-c++/routine-1-template-auto.C: Same.
	* testsuite/libgomp.oacc-c++/routine-1-template-trailing-return-type.C:
	Same.
	* testsuite/libgomp.oacc-c++/routine-1-template.C: Same.
	* testsuite/libgomp.oacc-c++/routine-1-trailing-return-type.C: Same.
	* testsuite/libgomp.oacc-c-c++-common/routine-1.c: Same.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@263265 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be8ba03f9df8d6e231d255ff92f3395304258d2e..4a6ef9207d01565e2caefd03a3924495534a1ece 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-02  Tom de Vries  <tdevries@suse.de>
+
+       PR target/86660
+       * common/config/nvptx/nvptx-common.c (nvptx_except_unwind_info): New
+       function.  Return UI_TARGET unconditionally.
+       (TARGET_EXCEPT_UNWIND_INFO): Redefine to nvptx_except_unwind_info.
+       * config/nvptx/nvptx.c (TARGET_ASM_BYTE_OP): Emit commented out '.byte'.
+
 2018-08-02  Richard Sandiford  <richard.sandiford@arm.com>
 
        * genemit.c (print_overload_test): Fix typo.

diff --git a/gcc/common/config/nvptx/nvptx-common.c b/gcc/common/config/nvptx/nvptx-common.c
index 27a4f4675d0a819482d7c11beb4196127f71268f..f31e0696281d25600017b20247e99fafa02e115a 100644 (file)
--- a/gcc/common/config/nvptx/nvptx-common.c
+++ b/gcc/common/config/nvptx/nvptx-common.c
@@ -30,10 +30,19 @@ along with GCC; see the file COPYING3.  If not see
 #include "opts.h"
 #include "flags.h"
 
+enum unwind_info_type
+nvptx_except_unwind_info (struct gcc_options *opts ATTRIBUTE_UNUSED)
+{
+  return UI_TARGET;
+}
+
 #undef TARGET_HAVE_NAMED_SECTIONS
 #define TARGET_HAVE_NAMED_SECTIONS false
 
 #undef TARGET_DEFAULT_TARGET_FLAGS
 #define TARGET_DEFAULT_TARGET_FLAGS MASK_ABI64
 
+#undef TARGET_EXCEPT_UNWIND_INFO
+#define TARGET_EXCEPT_UNWIND_INFO nvptx_except_unwind_info
+
 struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;

diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index c0b0a2ec3ab95f71132d3f49134ac6b2128b4b63..62fefda8612037ef1dbcada6aeae25c1548521f0 100644 (file)
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -6051,6 +6051,9 @@ nvptx_can_change_mode_class (machine_mode, machine_mode, reg_class_t)
 #undef TARGET_HAVE_SPECULATION_SAFE_VALUE
 #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed
 
+#undef TARGET_ASM_BYTE_OP
+#define TARGET_ASM_BYTE_OP "// .byte "
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-nvptx.h"

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1a361337f90f33ce23f85c3f70f3bf96227189b8..a44dc7c90d06cc2bfdb46530103ec25a83bf5f41 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,14 @@
+2018-08-02  Tom de Vries  <tdevries@suse.de>
+
+       PR target/86660
+       * testsuite/libgomp.oacc-c++/routine-1-auto.C: Remove -fno-exceptions.
+       * testsuite/libgomp.oacc-c++/routine-1-template-auto.C: Same.
+       * testsuite/libgomp.oacc-c++/routine-1-template-trailing-return-type.C:
+       Same.
+       * testsuite/libgomp.oacc-c++/routine-1-template.C: Same.
+       * testsuite/libgomp.oacc-c++/routine-1-trailing-return-type.C: Same.
+       * testsuite/libgomp.oacc-c-c++-common/routine-1.c: Same.
+
 2018-08-01  Cesar Philippidis  <cesar@codesourcery.com>
            Thomas Schwinge <thomas@codesourcery.com>
 

diff --git a/libgomp/testsuite/libgomp.oacc-c++/routine-1-auto.C b/libgomp/testsuite/libgomp.oacc-c++/routine-1-auto.C
index f4b54e55fa7a28c77a59dd0214092706b7311d62..771a2734306added2d16ba677e7d3ca2a75c2c09 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/routine-1-auto.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/routine-1-auto.C
@@ -1,7 +1,5 @@
 // Routine with "auto" return type.
 
-// { dg-additional-options "-fno-exceptions" }
-
 #define TEMPLATE
 #define TYPE int
 #define RETURN_1 auto

diff --git a/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-auto.C b/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-auto.C
index 444f1f32a765f873d823dd57a6d53b407a9e9e4f..17bdaa0c1c16851ebf1612685283526c40b68954 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-auto.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-auto.C
@@ -1,7 +1,5 @@
 // Templated routine with "auto" return type.
 
-// { dg-additional-options "-fno-exceptions" }
-
 #define TEMPLATE template<typename TYPE>
 #define RETURN_1 auto
 #define RETURN_2

diff --git a/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-trailing-return-type.C b/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-trailing-return-type.C
index bfe2787d9311bcddce20ee73a718ccfdd6d4a400..99faa8650414e43a1e8b82b98b44ddc35c340d98 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-trailing-return-type.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/routine-1-template-trailing-return-type.C
@@ -1,7 +1,5 @@
 // Templated routine using trailing return type syntax.
 
-// { dg-additional-options "-fno-exceptions" }
-
 #define TEMPLATE template<typename TYPE>
 #define RETURN_1 auto
 #define RETURN_2 -> TYPE

diff --git a/libgomp/testsuite/libgomp.oacc-c++/routine-1-template.C b/libgomp/testsuite/libgomp.oacc-c++/routine-1-template.C
index a7e0323d44f202a29d72386729b0367c498cbad6..89defb196b12a60d353ede0b6bea9d62829cfd7d 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/routine-1-template.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/routine-1-template.C
@@ -1,7 +1,5 @@
 // Templated routine.
 
-// { dg-additional-options "-fno-exceptions" }
-
 #define TEMPLATE template<typename TYPE>
 #define RETURN_1 TYPE
 #define RETURN_2

diff --git a/libgomp/testsuite/libgomp.oacc-c++/routine-1-trailing-return-type.C b/libgomp/testsuite/libgomp.oacc-c++/routine-1-trailing-return-type.C
index 3074ba47c2afe4e329a252a4f3edbb95691ec9bc..767e0ce46660ee2eb15726d4084586e2deab9466 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/routine-1-trailing-return-type.C
+++ b/libgomp/testsuite/libgomp.oacc-c++/routine-1-trailing-return-type.C
@@ -1,7 +1,5 @@
 // Routine using trailing return type syntax.
 
-// { dg-additional-options "-fno-exceptions" }
-
 #define TEMPLATE
 #define TYPE int
 #define RETURN_1 auto

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c
index 2a36b3b1fac6b1b7661b33d7dafeceb11902534e..0f70e264240d16b055db97aa8637156ca7358468 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c
@@ -1,5 +1,3 @@
-// { dg-additional-options "-fno-exceptions" }
-
 // Defaults, if not "#include"d from ../libgomp.oacc-c++/routine-1-*.C.
 #ifndef TEMPLATE
 # define TEMPLATE