AMDGPU: Report Arg's Value name in metadata if kernel_arg_name metadata is not available

Differential Revision: https://reviews.llvm.org/D40924

llvm-svn: 320176

4 files changed, 126 insertions, 63 deletions

diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll
index c07c5556ce3..76545b0377e 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll
@@ -3,7 +3,8 @@
 ; CHECK:      - Name:            test_ro_arg
 ; CHECK-NEXT:   SymbolName:      'test_ro_arg@kd'
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT: - TypeName:        'float*'
+; CHECK-NEXT: - Name:            in
+; CHECK-NEXT:   TypeName:        'float*'
 ; CHECK-NEXT:   Size:            8
 ; CHECK-NEXT:   Align:           8
 ; CHECK-NEXT:   ValueKind:       GlobalBuffer
@@ -12,7 +13,8 @@
 ; CHECK-NEXT:   AccQual:         ReadOnly
 ; CHECK-NEXT:   IsConst:         true
 ; CHECK-NEXT:   IsRestrict:      true
-; CHECK-NEXT: - TypeName:        'float*'
+; CHECK-NEXT: - Name:            out
+; CHECK-NEXT:   TypeName:        'float*'
 ; CHECK-NEXT:   Size:            8
 ; CHECK-NEXT:   Align:           8
 ; CHECK-NEXT:   ValueKind:       GlobalBuffer
diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueu-kernel.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueu-kernel.ll
index c5121a7fd3b..83baf5be57b 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueu-kernel.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-enqueu-kernel.ll
@@ -11,7 +11,8 @@
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      char
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      char
 ; CHECK-NEXT:       Size:          1
 ; CHECK-NEXT:       Align:         1
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -43,7 +44,8 @@ define amdgpu_kernel void @test_non_enqueue_kernel_caller(i8 %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      char
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      char
 ; CHECK-NEXT:       Size:          1
 ; CHECK-NEXT:       Align:         1
 ; CHECK-NEXT:       ValueKind:     ByValue
diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll
index ea47f83aef3..06fc5eae061 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll
@@ -28,7 +28,8 @@
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      char
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      char
 ; CHECK-NEXT:       Size:          1
 ; CHECK-NEXT:       Align:         1
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -64,7 +65,8 @@ define amdgpu_kernel void @test_char(i8 %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      ushort2
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      ushort2
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -98,7 +100,8 @@ define amdgpu_kernel void @test_ushort2(<2 x i16> %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int3
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int3
 ; CHECK-NEXT:       Size:          16
 ; CHECK-NEXT:       Align:         16
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -132,7 +135,8 @@ define amdgpu_kernel void @test_int3(<3 x i32> %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      ulong4
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      ulong4
 ; CHECK-NEXT:       Size:          32
 ; CHECK-NEXT:       Align:         32
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -166,7 +170,8 @@ define amdgpu_kernel void @test_ulong4(<4 x i64> %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      half8
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      half8
 ; CHECK-NEXT:       Size:          16
 ; CHECK-NEXT:       Align:         16
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -200,7 +205,8 @@ define amdgpu_kernel void @test_half8(<8 x half> %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      float16
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      float16
 ; CHECK-NEXT:       Size:          64
 ; CHECK-NEXT:       Align:         64
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -234,7 +240,8 @@ define amdgpu_kernel void @test_float16(<16 x float> %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      double16
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      double16
 ; CHECK-NEXT:       Size:          128
 ; CHECK-NEXT:       Align:         128
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -268,7 +275,8 @@ define amdgpu_kernel void @test_double16(<16 x double> %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      'int *'
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      'int *'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
@@ -303,7 +311,8 @@ define amdgpu_kernel void @test_pointer(i32 addrspace(1)* %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      image2d_t
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      image2d_t
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     Image
@@ -338,7 +347,8 @@ define amdgpu_kernel void @test_image(%opencl.image2d_t addrspace(1)* %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      sampler_t
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      sampler_t
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     Sampler
@@ -372,7 +382,8 @@ define amdgpu_kernel void @test_sampler(i32 %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      queue_t
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      queue_t
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     Queue
@@ -407,7 +418,8 @@ define amdgpu_kernel void @test_queue(%opencl.queue_t addrspace(1)* %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      struct A
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      struct A
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
@@ -442,7 +454,8 @@ define amdgpu_kernel void @test_struct(%struct.A* byval %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      i128
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      i128
 ; CHECK-NEXT:       Size:          16
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -476,19 +489,22 @@ define amdgpu_kernel void @test_i128(i128 %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
 ; CHECK-NEXT:       ValueType:     I32
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      short2
+; CHECK-NEXT:     - Name:          b
+; CHECK-NEXT:       TypeName:      short2
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
 ; CHECK-NEXT:       ValueType:     I16
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      char3
+; CHECK-NEXT:     - Name:          c
+; CHECK-NEXT:       TypeName:      char3
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -522,21 +538,24 @@ define amdgpu_kernel void @test_multi_arg(i32 %a, <2 x i16> %b, <3 x i8> %c)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      'int *'
+; CHECK-NEXT:     - Name:          g
+; CHECK-NEXT:       TypeName:      'int *'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
 ; CHECK-NEXT:       ValueType:     I32
 ; CHECK-NEXT:       AddrSpaceQual: Global
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'int *'
+; CHECK-NEXT:     - Name:          c
+; CHECK-NEXT:       TypeName:      'int *'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
 ; CHECK-NEXT:       ValueType:     I32
 ; CHECK-NEXT:       AddrSpaceQual: Constant
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'int *'
+; CHECK-NEXT:     - Name:          l
+; CHECK-NEXT:       TypeName:      'int *'
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     DynamicSharedPointer
@@ -574,7 +593,8 @@ define amdgpu_kernel void @test_addr_space(i32 addrspace(1)* %g,
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      'int *'
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      'int *'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
@@ -582,7 +602,8 @@ define amdgpu_kernel void @test_addr_space(i32 addrspace(1)* %g,
 ; CHECK-NEXT:       AddrSpaceQual: Global
 ; CHECK-NEXT:       AccQual:       Default
 ; CHECK-NEXT:       IsVolatile:    true
-; CHECK-NEXT:     - TypeName:      'int *'
+; CHECK-NEXT:     - Name:          b
+; CHECK-NEXT:       TypeName:      'int *'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
@@ -591,7 +612,8 @@ define amdgpu_kernel void @test_addr_space(i32 addrspace(1)* %g,
 ; CHECK-NEXT:       AccQual:       Default
 ; CHECK-NEXT:       IsConst:       true
 ; CHECK-NEXT:       IsRestrict:    true
-; CHECK-NEXT:     - TypeName:      'int *'
+; CHECK-NEXT:     - Name:          c
+; CHECK-NEXT:       TypeName:      'int *'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     Pipe
@@ -629,21 +651,24 @@ define amdgpu_kernel void @test_type_qual(i32 addrspace(1)* %a,
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      image1d_t
+; CHECK-NEXT:     - Name:          ro
+; CHECK-NEXT:       TypeName:      image1d_t
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     Image
 ; CHECK-NEXT:       ValueType:     Struct
 ; CHECK-NEXT:       AddrSpaceQual: Global
 ; CHECK-NEXT:       AccQual:       ReadOnly
-; CHECK-NEXT:     - TypeName:      image2d_t
+; CHECK-NEXT:     - Name:          wo
+; CHECK-NEXT:       TypeName:      image2d_t
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     Image
 ; CHECK-NEXT:       ValueType:     Struct
 ; CHECK-NEXT:       AddrSpaceQual: Global
 ; CHECK-NEXT:       AccQual:       WriteOnly
-; CHECK-NEXT:     - TypeName:      image3d_t
+; CHECK-NEXT:     - Name:          rw
+; CHECK-NEXT:       TypeName:      image3d_t
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     Image
@@ -682,7 +707,8 @@ define amdgpu_kernel void @test_access_qual(%opencl.image1d_t addrspace(1)* %ro,
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       VecTypeHint:   half
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -718,7 +744,8 @@ define amdgpu_kernel void @test_vec_type_hint_half(i32 %a)
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       VecTypeHint:   float
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -754,7 +781,8 @@ define amdgpu_kernel void @test_vec_type_hint_float(i32 %a)
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       VecTypeHint:   double
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -790,7 +818,8 @@ define amdgpu_kernel void @test_vec_type_hint_double(i32 %a)
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       VecTypeHint:   char
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -826,7 +855,8 @@ define amdgpu_kernel void @test_vec_type_hint_char(i32 %a)
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       VecTypeHint:   short
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -862,7 +892,8 @@ define amdgpu_kernel void @test_vec_type_hint_short(i32 %a)
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       VecTypeHint:   long
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -898,7 +929,8 @@ define amdgpu_kernel void @test_vec_type_hint_long(i32 %a)
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       VecTypeHint:   unknown
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      int
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      int
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -935,7 +967,8 @@ define amdgpu_kernel void @test_vec_type_hint_unknown(i32 %a)
 ; CHECK-NEXT:       ReqdWorkGroupSize: [ 1, 2, 4 ]
 ; CHECK-NEXT:       VecTypeHint:       int
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:          int
+; CHECK-NEXT:     - Name:              a
+; CHECK-NEXT:       TypeName:          int
 ; CHECK-NEXT:       Size:              4
 ; CHECK-NEXT:       Align:             4
 ; CHECK-NEXT:       ValueKind:         ByValue
@@ -973,7 +1006,8 @@ define amdgpu_kernel void @test_reqd_wgs_vec_type_hint(i32 %a)
 ; CHECK-NEXT:       WorkGroupSizeHint: [ 8, 16, 32 ]
 ; CHECK-NEXT:       VecTypeHint:       uint4
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:          int
+; CHECK-NEXT:     - Name:              a
+; CHECK-NEXT:       TypeName:          int
 ; CHECK-NEXT:       Size:              4
 ; CHECK-NEXT:       Align:             4
 ; CHECK-NEXT:       ValueKind:         ByValue
@@ -1008,7 +1042,8 @@ define amdgpu_kernel void @test_wgs_hint_vec_type_hint(i32 %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      'int **'
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      'int **'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
@@ -1043,7 +1078,8 @@ define amdgpu_kernel void @test_arg_ptr_to_ptr(i32* addrspace(1)* %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      struct B
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      struct B
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
@@ -1078,7 +1114,8 @@ define amdgpu_kernel void @test_arg_struct_contains_ptr(%struct.B* byval %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      'global int* __attribute__((ext_vector_type(2)))'
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      'global int* __attribute__((ext_vector_type(2)))'
 ; CHECK-NEXT:       Size:          16
 ; CHECK-NEXT:       Align:         16
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -1112,7 +1149,8 @@ define amdgpu_kernel void @test_arg_vector_of_ptr(<2 x i32 addrspace(1)*> %a)
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      clk_event_t
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      clk_event_t
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
@@ -1148,14 +1186,16 @@ define amdgpu_kernel void @test_arg_unknown_builtin_type(
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      'long *'
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      'long *'
 ; CHECK-NEXT:       Size:          8
 ; CHECK-NEXT:       Align:         8
 ; CHECK-NEXT:       ValueKind:     GlobalBuffer
 ; CHECK-NEXT:       ValueType:     I64
 ; CHECK-NEXT:       AddrSpaceQual: Global
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'char *'
+; CHECK-NEXT:     - Name:          b
+; CHECK-NEXT:       TypeName:      'char *'
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     DynamicSharedPointer
@@ -1163,7 +1203,8 @@ define amdgpu_kernel void @test_arg_unknown_builtin_type(
 ; CHECK-NEXT:       PointeeAlign:  1
 ; CHECK-NEXT:       AddrSpaceQual: Local
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'char2 *'
+; CHECK-NEXT:     - Name:          c
+; CHECK-NEXT:       TypeName:      'char2 *'
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     DynamicSharedPointer
@@ -1171,7 +1212,8 @@ define amdgpu_kernel void @test_arg_unknown_builtin_type(
 ; CHECK-NEXT:       PointeeAlign:  2
 ; CHECK-NEXT:       AddrSpaceQual: Local
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'char3 *'
+; CHECK-NEXT:     - Name:          d
+; CHECK-NEXT:       TypeName:      'char3 *'
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     DynamicSharedPointer
@@ -1179,7 +1221,8 @@ define amdgpu_kernel void @test_arg_unknown_builtin_type(
 ; CHECK-NEXT:       PointeeAlign:  4
 ; CHECK-NEXT:       AddrSpaceQual: Local
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'char4 *'
+; CHECK-NEXT:     - Name:          e
+; CHECK-NEXT:       TypeName:      'char4 *'
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     DynamicSharedPointer
@@ -1187,7 +1230,8 @@ define amdgpu_kernel void @test_arg_unknown_builtin_type(
 ; CHECK-NEXT:       PointeeAlign:  4
 ; CHECK-NEXT:       AddrSpaceQual: Local
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'char8 *'
+; CHECK-NEXT:     - Name:          f
+; CHECK-NEXT:       TypeName:      'char8 *'
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     DynamicSharedPointer
@@ -1195,7 +1239,8 @@ define amdgpu_kernel void @test_arg_unknown_builtin_type(
 ; CHECK-NEXT:       PointeeAlign:  8
 ; CHECK-NEXT:       AddrSpaceQual: Local
 ; CHECK-NEXT:       AccQual:       Default
-; CHECK-NEXT:     - TypeName:      'char16 *'
+; CHECK-NEXT:     - Name:          g
+; CHECK-NEXT:       TypeName:      'char16 *'
 ; CHECK-NEXT:       Size:          4
 ; CHECK-NEXT:       Align:         4
 ; CHECK-NEXT:       ValueKind:     DynamicSharedPointer
@@ -1239,7 +1284,8 @@ define amdgpu_kernel void @test_pointee_align(i64 addrspace(1)* %a,
 ; CHECK-NEXT:   Attrs:
 ; CHECK-NEXT:       RuntimeHandle: __test_block_invoke_kernel_runtime_handle
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      __block_literal
+; CHECK-NEXT:     - Name:          arg
+; CHECK-NEXT:       TypeName:      __block_literal
 ; CHECK-NEXT:       Size:          25
 ; CHECK-NEXT:       Align:         1
 ; CHECK-NEXT:       ValueKind:     ByValue
@@ -1274,7 +1320,8 @@ define amdgpu_kernel void @__test_block_invoke_kernel(
 ; CHECK-NEXT:   Language:        OpenCL C
 ; CHECK-NEXT:   LanguageVersion: [ 2, 0 ]
 ; CHECK-NEXT:   Args:
-; CHECK-NEXT:     - TypeName:      char
+; CHECK-NEXT:     - Name:          a
+; CHECK-NEXT:       TypeName:      char
 ; CHECK-NEXT:       Size:          1
 ; CHECK-NEXT:       Align:         1
 ; CHECK-NEXT:       ValueKind:     ByValue
diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll
index 286f57399b7..f6290d41f69 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll
@@ -22,40 +22,52 @@
 ; CHECK:    - Name:       test
 ; CHECK:      SymbolName: 'test@kd'
 ; CHECK:      Args:
-; CHECK:        - TypeName:  image1d_t
+; CHECK:        - Name:      a
+; CHECK:          TypeName:  image1d_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image1d_array_t
+; CHECK:        - Name:      b
+; CHECK:          TypeName:  image1d_array_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image1d_buffer_t
+; CHECK:        - Name:      c
+; CHECK:          TypeName:  image1d_buffer_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_t
+; CHECK:        - Name:      d
+; CHECK:          TypeName:  image2d_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_array_t
+; CHECK:        - Name:      e
+; CHECK:          TypeName:  image2d_array_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_array_depth_t
+; CHECK:        - Name:      f
+; CHECK:          TypeName:  image2d_array_depth_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_array_msaa_t
+; CHECK:        - Name:      g
+; CHECK:          TypeName:  image2d_array_msaa_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_array_msaa_depth_t
+; CHECK:        - Name:      h
+; CHECK:          TypeName:  image2d_array_msaa_depth_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_depth_t
+; CHECK:        - Name:      i
+; CHECK:          TypeName:  image2d_depth_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_msaa_t
+; CHECK:        - Name:      j
+; CHECK:          TypeName:  image2d_msaa_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image2d_msaa_depth_t
+; CHECK:        - Name:      k
+; CHECK:          TypeName:  image2d_msaa_depth_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
-; CHECK:        - TypeName:  image3d_t
+; CHECK:        - Name:      l
+; CHECK:          TypeName:  image3d_t
 ; CHECK:          Size:      8
 ; CHECK:          ValueKind: Image
 define amdgpu_kernel void @test(%opencl.image1d_t addrspace(1)* %a,