I've applied this to gomp4 branch.

There was an inconsistency with the 'S' assembly formatter, in that it didn't print the leading '.', but the others did. Also the pseudo's structure is no longer used.

nathan
2015-08-04  Nathan Sidwell  <nat...@codesourcery.com>

	* config/nvptx/nvptx.md (nvptx_shuffle<mode>): Adjust assembly.
	* config/nvptx/nvptx.c (nvptx_print_operand): Adjust 'S' case to
	print leading . for consistency.
	* config/nvptx/nvptx.h (struct nvptx_pseudo_info): Delete.
	(machine_function): Remove pseudos field.

Index: gcc/config/nvptx/nvptx.md
===================================================================
--- gcc/config/nvptx/nvptx.md	(revision 226569)
+++ gcc/config/nvptx/nvptx.md	(working copy)
@@ -1419,7 +1419,7 @@
 		 (match_operand:SI 3 "const_int_operand" "n")]
 		  UNSPEC_SHUFFLE))]
   ""
-  "%.\\tshfl.%S3.b32\\t%0, %1, %2, 31;")
+  "%.\\tshfl%S3.b32\\t%0, %1, %2, 31;")
 
 ;; extract parts of a 64 bit object into 2 32-bit ints
 (define_insn "unpack<mode>si2"
Index: gcc/config/nvptx/nvptx.c
===================================================================
--- gcc/config/nvptx/nvptx.c	(revision 226569)
+++ gcc/config/nvptx/nvptx.c	(working copy)
@@ -2008,7 +2008,7 @@ nvptx_print_operand (FILE *file, rtx x,
 	unsigned kind = UINTVAL (x);
 	static const char *const kinds[] = 
 	  {"up", "down", "bfly", "idx"};
-	fprintf (file, "%s", kinds[kind]);
+	fprintf (file, ".%s", kinds[kind]);
       }
       break;
       
Index: gcc/config/nvptx/nvptx.h
===================================================================
--- gcc/config/nvptx/nvptx.h	(revision 226569)
+++ gcc/config/nvptx/nvptx.h	(working copy)
@@ -225,12 +225,6 @@ struct nvptx_args {
 #define LEGITIMATE_PIC_OPERAND_P(X) 1
 
 
-struct nvptx_pseudo_info
-{
-  int true_size;
-  int renumber;
-};
-
 #if defined HOST_WIDE_INT
 struct GTY(()) machine_function
 {
@@ -239,7 +233,6 @@ struct GTY(()) machine_function
   tree funtype;
   bool has_call_with_varargs;
   bool has_call_with_sc;
-  struct GTY((skip)) nvptx_pseudo_info *pseudos;
   HOST_WIDE_INT outgoing_stdarg_size;
   int ret_reg_mode;
   int punning_buffer_size;

Reply via email to