Index: llvm/trunk/lib/Target/AMDGPU/AMDGPU.td
===================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPU.td
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPU.td
@@ -358,6 +358,8 @@
   int SDWA_ID = 2;
   string DPP = "DPP";
   int DPP_ID = 3;
+  string Disable = "Disable";
+  int Disable_ID = 4;
 }
 
 def DefaultAMDGPUAsmParserVariant : AsmParserVariant {
Index: llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.td
===================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.td
+++ llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.td
@@ -1245,6 +1245,8 @@
   VOP1_DPPe <op.VI>,
   VOP_DPP <p.OutsDPP, p.InsDPP, opName#p.AsmDPP, [], p.HasModifiers> {
   let AssemblerPredicates = !if(p.HasExt, [isVI], [DisableInst]);
+  let AsmVariantName = !if(p.HasExt, AMDGPUAsmVariants.DPP,
+                                     AMDGPUAsmVariants.Disable);
   let DecoderNamespace = "DPP";
   let DisableDecoder = DisableVIDecoder;
   let src0_modifiers = !if(p.HasModifiers, ?, 0);
@@ -1280,6 +1282,8 @@
   SDWADisableFields <p> {
   let AsmMatchConverter = "cvtSdwaVOP1";
   let AssemblerPredicates = !if(p.HasExt, [isVI], [DisableInst]);
+  let AsmVariantName = !if(p.HasExt, AMDGPUAsmVariants.SDWA,
+                                     AMDGPUAsmVariants.Disable);
   let DecoderNamespace = "SDWA";
   let DisableDecoder = DisableVIDecoder;
 }
@@ -1342,6 +1346,8 @@
   VOP2_DPPe <op.VI>,
   VOP_DPP <p.OutsDPP, p.InsDPP, opName#p.AsmDPP, [], p.HasModifiers> {
   let AssemblerPredicates = !if(p.HasExt, [isVI], [DisableInst]);
+  let AsmVariantName = !if(p.HasExt, AMDGPUAsmVariants.DPP,
+                                     AMDGPUAsmVariants.Disable);
   let DecoderNamespace = "DPP";
   let DisableDecoder = DisableVIDecoder;
   let src0_modifiers = !if(p.HasModifiers, ?, 0);
@@ -1354,6 +1360,8 @@
   SDWADisableFields <p> {
   let AsmMatchConverter = "cvtSdwaVOP2";
   let AssemblerPredicates = !if(p.HasExt, [isVI], [DisableInst]);
+  let AsmVariantName = !if(p.HasExt, AMDGPUAsmVariants.SDWA,
+                                     AMDGPUAsmVariants.Disable);
   let DecoderNamespace = "SDWA";
   let DisableDecoder = DisableVIDecoder;
 }
@@ -1809,6 +1817,8 @@
   let hasSideEffects = DefExec;
   let AsmMatchConverter = "cvtSdwaVOPC";
   let AssemblerPredicates = !if(p.HasExt, [isVI], [DisableInst]);
+  let AsmVariantName = !if(p.HasExt, AMDGPUAsmVariants.SDWA,
+                                     AMDGPUAsmVariants.Disable);
   let DecoderNamespace = "SDWA";
   let DisableDecoder = DisableVIDecoder;
 }