diff --git a/llvm/include/llvm/TargetParser/TargetParser.h b/llvm/include/llvm/TargetParser/TargetParser.h
index 9b8d1f3c31121..2f68d66dee90f 100644
--- a/llvm/include/llvm/TargetParser/TargetParser.h
+++ b/llvm/include/llvm/TargetParser/TargetParser.h
@@ -40,89 +40,89 @@ enum GPUKind : uint32_t {
   GK_NONE = 0,
 
   // R600-based processors.
-  GK_R600 = 1,
-  GK_R630 = 2,
-  GK_RS880 = 3,
-  GK_RV670 = 4,
-  GK_RV710 = 5,
-  GK_RV730 = 6,
-  GK_RV770 = 7,
-  GK_CEDAR = 8,
-  GK_CYPRESS = 9,
-  GK_JUNIPER = 10,
-  GK_REDWOOD = 11,
-  GK_SUMO = 12,
-  GK_BARTS = 13,
-  GK_CAICOS = 14,
-  GK_CAYMAN = 15,
-  GK_TURKS = 16,
+  GK_R600,
+  GK_R630,
+  GK_RS880,
+  GK_RV670,
+  GK_RV710,
+  GK_RV730,
+  GK_RV770,
+  GK_CEDAR,
+  GK_CYPRESS,
+  GK_JUNIPER,
+  GK_REDWOOD,
+  GK_SUMO,
+  GK_BARTS,
+  GK_CAICOS,
+  GK_CAYMAN,
+  GK_TURKS,
 
   GK_R600_FIRST = GK_R600,
   GK_R600_LAST = GK_TURKS,
 
   // AMDGCN-based processors.
-  GK_GFX600 = 32,
-  GK_GFX601 = 33,
-  GK_GFX602 = 34,
-
-  GK_GFX700 = 40,
-  GK_GFX701 = 41,
-  GK_GFX702 = 42,
-  GK_GFX703 = 43,
-  GK_GFX704 = 44,
-  GK_GFX705 = 45,
-
-  GK_GFX801 = 50,
-  GK_GFX802 = 51,
-  GK_GFX803 = 52,
-  GK_GFX805 = 53,
-  GK_GFX810 = 54,
-
-  GK_GFX900 = 60,
-  GK_GFX902 = 61,
-  GK_GFX904 = 62,
-  GK_GFX906 = 63,
-  GK_GFX908 = 64,
-  GK_GFX909 = 65,
-  GK_GFX90A = 66,
-  GK_GFX90C = 67,
-  GK_GFX942 = 70,
-  GK_GFX950 = 71,
-
-  GK_GFX1010 = 72,
-  GK_GFX1011 = 73,
-  GK_GFX1012 = 74,
-  GK_GFX1013 = 75,
-  GK_GFX1030 = 76,
-  GK_GFX1031 = 77,
-  GK_GFX1032 = 78,
-  GK_GFX1033 = 79,
-  GK_GFX1034 = 80,
-  GK_GFX1035 = 81,
-  GK_GFX1036 = 82,
-
-  GK_GFX1100 = 90,
-  GK_GFX1101 = 91,
-  GK_GFX1102 = 92,
-  GK_GFX1103 = 93,
-  GK_GFX1150 = 94,
-  GK_GFX1151 = 95,
-  GK_GFX1152 = 96,
-  GK_GFX1153 = 97,
-
-  GK_GFX1200 = 100,
-  GK_GFX1201 = 101,
-  GK_GFX1250 = 102,
+  GK_GFX600,
+  GK_GFX601,
+  GK_GFX602,
+
+  GK_GFX700,
+  GK_GFX701,
+  GK_GFX702,
+  GK_GFX703,
+  GK_GFX704,
+  GK_GFX705,
+
+  GK_GFX801,
+  GK_GFX802,
+  GK_GFX803,
+  GK_GFX805,
+  GK_GFX810,
+
+  GK_GFX900,
+  GK_GFX902,
+  GK_GFX904,
+  GK_GFX906,
+  GK_GFX908,
+  GK_GFX909,
+  GK_GFX90A,
+  GK_GFX90C,
+  GK_GFX942,
+  GK_GFX950,
+
+  GK_GFX1010,
+  GK_GFX1011,
+  GK_GFX1012,
+  GK_GFX1013,
+  GK_GFX1030,
+  GK_GFX1031,
+  GK_GFX1032,
+  GK_GFX1033,
+  GK_GFX1034,
+  GK_GFX1035,
+  GK_GFX1036,
+
+  GK_GFX1100,
+  GK_GFX1101,
+  GK_GFX1102,
+  GK_GFX1103,
+  GK_GFX1150,
+  GK_GFX1151,
+  GK_GFX1152,
+  GK_GFX1153,
+
+  GK_GFX1200,
+  GK_GFX1201,
+  GK_GFX1250,
 
   GK_AMDGCN_FIRST = GK_GFX600,
   GK_AMDGCN_LAST = GK_GFX1250,
 
-  GK_GFX9_GENERIC = 192,
-  GK_GFX10_1_GENERIC = 193,
-  GK_GFX10_3_GENERIC = 194,
-  GK_GFX11_GENERIC = 195,
-  GK_GFX12_GENERIC = 196,
-  GK_GFX9_4_GENERIC = 197,
+  GK_GFX9_GENERIC,
+  GK_GFX10_1_GENERIC,
+  GK_GFX10_3_GENERIC,
+  GK_GFX11_GENERIC,
+  GK_GFX12_GENERIC,
+  GK_GFX9_4_GENERIC,
 
   GK_AMDGCN_GENERIC_FIRST = GK_GFX9_GENERIC,
   GK_AMDGCN_GENERIC_LAST = GK_GFX9_4_GENERIC,