Index: lib/Target/AMDGPU/AMDGPU.td
===================================================================
--- lib/Target/AMDGPU/AMDGPU.td
+++ lib/Target/AMDGPU/AMDGPU.td
@@ -536,8 +536,7 @@
   [FeatureVolcanicIslands,
    FeatureFastFMAF32,
    HalfRate64Ops,
-   FeatureLDSBankCount32,
-   FeatureXNACK]>;
+   FeatureLDSBankCount32]>;
 
 def FeatureISAVersion8_0_2 : SubtargetFeatureISAVersion <8,0,2,
   [FeatureVolcanicIslands,
@@ -550,8 +549,7 @@
 
 def FeatureISAVersion8_1_0 : SubtargetFeatureISAVersion <8,1,0,
   [FeatureVolcanicIslands,
-   FeatureLDSBankCount16,
-   FeatureXNACK]>;
+   FeatureLDSBankCount16]>;
 
 def FeatureISAVersion9_0_0 : SubtargetFeatureISAVersion <9,0,0,
   [FeatureGFX9,
Index: test/CodeGen/AMDGPU/flat-scratch-reg.ll
===================================================================
--- test/CodeGen/AMDGPU/flat-scratch-reg.ll
+++ test/CodeGen/AMDGPU/flat-scratch-reg.ll
@@ -4,8 +4,8 @@
 ; RUN: llc -march=amdgcn -mcpu=carrizo -mattr=-xnack -verify-machineinstrs < %s | FileCheck -check-prefix=VI-NOXNACK  -check-prefix=GCN %s
 ; RUN: llc -march=amdgcn -mcpu=stoney -mattr=-xnack -verify-machineinstrs < %s | FileCheck -check-prefix=VI-NOXNACK  -check-prefix=GCN %s
 
-; RUN: llc -march=amdgcn -mcpu=carrizo -verify-machineinstrs < %s | FileCheck -check-prefix=VI-XNACK  -check-prefix=GCN %s
-; RUN: llc -march=amdgcn -mcpu=stoney  -verify-machineinstrs < %s | FileCheck -check-prefix=VI-XNACK  -check-prefix=GCN %s
+; RUN: llc -march=amdgcn -mcpu=carrizo -mattr=+xnack -verify-machineinstrs < %s | FileCheck -check-prefix=VI-XNACK  -check-prefix=GCN %s
+; RUN: llc -march=amdgcn -mcpu=stoney -mattr=+xnack  -verify-machineinstrs < %s | FileCheck -check-prefix=VI-XNACK  -check-prefix=GCN %s
 
 ; RUN: llc -march=amdgcn -mtriple=amdgcn--amdhsa -mcpu=kaveri -verify-machineinstrs < %s | FileCheck -check-prefix=HSA-CI -check-prefix=GCN %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn--amdhsa -mcpu=carrizo -mattr=-xnack -verify-machineinstrs < %s | FileCheck -check-prefix=HSA-VI-NOXNACK -check-prefix=GCN %s
Index: test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
===================================================================
--- test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
+++ test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
@@ -1,26 +1,36 @@
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX700 --check-prefix=NOTES %s
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx800 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX800 --check-prefix=NOTES %s
-; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=GFX700 %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -mattr=+xnack -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=GFX700-XNACK --check-prefix=XNACK %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx800 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=GFX800 %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx800 -mattr=+xnack -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=GFX800-XNACK --check-prefix=XNACK %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=GFX900 %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+xnack -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck --check-prefix=GCN --check-prefix=GFX900-XNACK --check-prefix=XNACK %s
 
-; CHECK: ---
-; CHECK:  Version: [ 1, 0 ]
+; GCN: ---
+; GCN:  Version: [ 1, 0 ]
+; GCN:    Kernels:
 
-; CHECK:  Kernels:
-; CHECK:    - Name:       test
-; CHECK:      SymbolName: 'test@kd'
-; CHECK:      CodeProps:
-; CHECK:        KernargSegmentSize:      24
-; CHECK:        GroupSegmentFixedSize:   0
-; CHECK:        PrivateSegmentFixedSize: 0
-; CHECK:        KernargSegmentAlign:     8
-; CHECK:        WavefrontSize:           64
+; GCN:      - Name:       test
+; GCN:        SymbolName: 'test@kd'
+; GCN:        CodeProps:
+; GCN:          KernargSegmentSize:      24
+; GCN:          GroupSegmentFixedSize:   0
+; GCN:          PrivateSegmentFixedSize: 0
+; GCN:          KernargSegmentAlign:     8
+; GCN:          WavefrontSize:           64
 ; GFX700:       NumSGPRs:                6
 ; GFX800:       NumSGPRs:                96
 ; GFX900:       NumSGPRs:                6
 ; GFX700:       NumVGPRs:                4
 ; GFX800:       NumVGPRs:                6
 ; GFX900:       NumVGPRs:                6
-; CHECK:        MaxFlatWorkGroupSize:    256
+; GFX700-XNACK: NumSGPRs:                6
+; GFX800-XNACK: NumSGPRs:                96
+; GFX900-XNACK: NumSGPRs:                10
+; GFX700-XNACK: NumVGPRs:                4
+; GFX800-XNACK: NumVGPRs:                6
+; GFX900-XNACK: NumVGPRs:                6
+; GCN:          MaxFlatWorkGroupSize:    256
+; XNACK:        IsXNACKEnabled:          true
 define amdgpu_kernel void @test(
     half addrspace(1)* %r,
     half addrspace(1)* %a,