Index: lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp
===================================================================
--- lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp
+++ lib/Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp
@@ -1349,7 +1349,7 @@
     return;
   }
 
-  O << formatDec(Imm);
+  O << ' ' << formatDec(Imm);
 }
 
 #include "AMDGPUGenAsmWriter.inc"
Index: lib/Target/AMDGPU/SOPInstructions.td
===================================================================
--- lib/Target/AMDGPU/SOPInstructions.td
+++ lib/Target/AMDGPU/SOPInstructions.td
@@ -919,7 +919,7 @@
 
 let isTerminator = 1 in {
 
-def S_ENDPGM : SOPP <0x00000001, (ins EndpgmImm:$simm16), "s_endpgm $simm16"> {
+def S_ENDPGM : SOPP <0x00000001, (ins EndpgmImm:$simm16), "s_endpgm$simm16"> {
   let isBarrier = 1;
   let isReturn = 1;
 }
Index: test/MC/AMDGPU/s_endpgm.s
===================================================================
--- test/MC/AMDGPU/s_endpgm.s
+++ test/MC/AMDGPU/s_endpgm.s
@@ -1,17 +1,18 @@
+// RUN: llvm-mc -arch=amdgcn %s | FileCheck -strict-whitespace %s -check-prefix=WHITESPACE
 // RUN: llvm-mc -arch=amdgcn -show-encoding %s | FileCheck %s --check-prefix=GCN
 // RUN: llvm-mc -arch=amdgcn -mcpu=gfx900 -filetype=obj %s | llvm-objcopy -S -K keep_symbol - | llvm-objdump -disassemble -mcpu=gfx900 - | FileCheck %s --check-prefix=BIN
 
+// WHITESPACE: s_endpgm{{$}}
 // GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]
 // BIN: s_endpgm    // 000000000000: BF810000
 s_endpgm
 
+// WHITESPACE: s_endpgm{{$}}
 // GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]
 // BIN: s_endpgm    // 000000000004: BF810000
 s_endpgm 0
 
-  
+// WHITESPACE: s_endpgm 1{{$}}
 // GCN: s_endpgm 1 ; encoding: [0x01,0x00,0x81,0xbf]
 // BIN: s_endpgm 1  // 000000000008: BF810001
 s_endpgm 1
-  
-