Index: llvm/trunk/include/llvm/Support/AMDGPUMetadata.h
===================================================================
--- llvm/trunk/include/llvm/Support/AMDGPUMetadata.h
+++ llvm/trunk/include/llvm/Support/AMDGPUMetadata.h
@@ -435,29 +435,29 @@
 
 /// \brief PAL metadata keys.
 enum Key : uint32_t {
-  LS_NUM_USED_VGPRS = 0x10000015,
-  HS_NUM_USED_VGPRS = 0x10000016,
-  ES_NUM_USED_VGPRS = 0x10000017,
-  GS_NUM_USED_VGPRS = 0x10000018,
-  VS_NUM_USED_VGPRS = 0x10000019,
-  PS_NUM_USED_VGPRS = 0x1000001a,
-  CS_NUM_USED_VGPRS = 0x1000001b,
-
-  LS_NUM_USED_SGPRS = 0x1000001c,
-  HS_NUM_USED_SGPRS = 0x1000001d,
-  ES_NUM_USED_SGPRS = 0x1000001e,
-  GS_NUM_USED_SGPRS = 0x1000001f,
-  VS_NUM_USED_SGPRS = 0x10000020,
-  PS_NUM_USED_SGPRS = 0x10000021,
-  CS_NUM_USED_SGPRS = 0x10000022,
-
-  LS_SCRATCH_SIZE = 0x10000038,
-  HS_SCRATCH_SIZE = 0x10000039,
-  ES_SCRATCH_SIZE = 0x1000003a,
-  GS_SCRATCH_SIZE = 0x1000003b,
-  VS_SCRATCH_SIZE = 0x1000003c,
-  PS_SCRATCH_SIZE = 0x1000003d,
-  CS_SCRATCH_SIZE = 0x1000003e
+  LS_NUM_USED_VGPRS = 0x10000021,
+  HS_NUM_USED_VGPRS = 0x10000022,
+  ES_NUM_USED_VGPRS = 0x10000023,
+  GS_NUM_USED_VGPRS = 0x10000024,
+  VS_NUM_USED_VGPRS = 0x10000025,
+  PS_NUM_USED_VGPRS = 0x10000026,
+  CS_NUM_USED_VGPRS = 0x10000027,
+
+  LS_NUM_USED_SGPRS = 0x10000028,
+  HS_NUM_USED_SGPRS = 0x10000029,
+  ES_NUM_USED_SGPRS = 0x1000002a,
+  GS_NUM_USED_SGPRS = 0x1000002b,
+  VS_NUM_USED_SGPRS = 0x1000002c,
+  PS_NUM_USED_SGPRS = 0x1000002d,
+  CS_NUM_USED_SGPRS = 0x1000002e,
+
+  LS_SCRATCH_SIZE = 0x10000044,
+  HS_SCRATCH_SIZE = 0x10000045,
+  ES_SCRATCH_SIZE = 0x10000046,
+  GS_SCRATCH_SIZE = 0x10000047,
+  VS_SCRATCH_SIZE = 0x10000048,
+  PS_SCRATCH_SIZE = 0x10000049,
+  CS_SCRATCH_SIZE = 0x1000004a
 };
 
 /// \brief PAL metadata represented as a vector.
Index: llvm/trunk/test/CodeGen/AMDGPU/amdpal.ll
===================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/amdpal.ll
+++ llvm/trunk/test/CodeGen/AMDGPU/amdpal.ll
@@ -53,3 +53,6 @@
 }
 
 attributes #0 = { nounwind "amdgpu-git-ptr-high"="0x1234" }
+
+; Check we have CS_NUM_USED_VGPRS in PAL metadata.
+; PAL: .amd_amdgpu_pal_metadata {{.*}},0x10000027,