Index: test/CodeGen/AMDGPU/flat-scratch-reg.ll
===================================================================
--- test/CodeGen/AMDGPU/flat-scratch-reg.ll
+++ test/CodeGen/AMDGPU/flat-scratch-reg.ll
@@ -1,9 +1,16 @@
-; RUN: llc < %s -march=amdgcn -mcpu=kaveri -verify-machineinstrs | FileCheck %s --check-prefix=GCN --check-prefix=CI --check-prefix=NO-XNACK
-; RUN: llc < %s -march=amdgcn -mcpu=fiji -verify-machineinstrs | FileCheck %s --check-prefix=GCN --check-prefix=VI --check-prefix=NO-XNACK
-; RUN: llc < %s -march=amdgcn -mcpu=carrizo -mattr=+xnack -verify-machineinstrs | FileCheck %s --check-prefix=GCN --check-prefix=VI --check-prefix=XNACK
+; RUN: llc -march=amdgcn -mcpu=kaveri -verify-machineinstrs < %s | FileCheck -check-prefix=NOXNACK -check-prefix=CI -check-prefix=GCN %s
+; RUN: llc -march=amdgcn -mcpu=fiji -verify-machineinstrs < %s | FileCheck -check-prefix=NOXNACK -check-prefix=VI -check-prefix=GCN %s
+; RUN: llc -march=amdgcn -mcpu=carrizo -mattr=+xnack -verify-machineinstrs < %s | FileCheck -check-prefix=XNACK -check-prefix=VI  -check-prefix=GCN %s
+
+; RUN: llc -march=amdgcn -mtriple=amdgcn--amdhsa -mcpu=kaveri -verify-machineinstrs < %s | FileCheck -check-prefix=CI -check-prefix=NOXNACK -check-prefix=HSA-NOXNACK -check-prefix=HSA -check-prefix=GCN %s
+; RUN: llc -march=amdgcn -mtriple=amdgcn--amdhsa -mcpu=carrizo -mattr=-xnack -verify-machineinstrs < %s | FileCheck -check-prefix=VI -check-prefix=NOXNACK -check-prefix=HSA-NOXNACK -check-prefix=HSA -check-prefix=GCN %s
+; RUN: llc -march=amdgcn -mtriple=amdgcn--amdhsa -mcpu=carrizo -mattr=+xnack -verify-machineinstrs < %s | FileCheck -check-prefix=VI -check-prefix=XNACK -check-prefix=HSA-XNACK -check-prefix=HSA -check-prefix=GCN %s
 
 ; GCN-LABEL: {{^}}no_vcc_no_flat:
-; NO-XNACK: ; NumSgprs: 8
+; HSA-NOXNACK: is_xnack_enabled = 0
+; HSA-XNACK: is_xnack_enabled = 1
+
+; NOXNACK: ; NumSgprs: 8
 ; XNACK: ; NumSgprs: 12
 define void @no_vcc_no_flat() {
 entry:
@@ -12,7 +19,10 @@
 }
 
 ; GCN-LABEL: {{^}}vcc_no_flat:
-; NO-XNACK: ; NumSgprs: 10
+; HSA-NOXNACK: is_xnack_enabled = 0
+; HSA-XNACK: is_xnack_enabled = 1
+
+; NOXNACK: ; NumSgprs: 10
 ; XNACK: ; NumSgprs: 12
 define void @vcc_no_flat() {
 entry:
@@ -21,6 +31,9 @@
 }
 
 ; GCN-LABEL: {{^}}no_vcc_flat:
+; HSA-NOXNACK: is_xnack_enabled = 0
+; HSA-XNACK: is_xnack_enabled = 1
+
 ; CI: ; NumSgprs: 12
 ; VI: ; NumSgprs: 14
 define void @no_vcc_flat() {
@@ -30,6 +43,9 @@
 }
 
 ; GCN-LABEL: {{^}}vcc_flat:
+; HSA-NOXNACK: is_xnack_enabled = 0
+; HSA-XNACK: is_xnack_enabled = 1
+
 ; CI: ; NumSgprs: 12
 ; VI: ; NumSgprs: 14
 define void @vcc_flat() {