AMDGPU: Bring HSA metadata on par with the specification
Differential Revision: https://reviews.llvm.org/D38753
llvm-svn: 315821
diff --git a/llvm/test/CodeGen/AMDGPU/elf-notes.ll b/llvm/test/CodeGen/AMDGPU/elf-notes.ll
index 5ed14ea..1409356 100644
--- a/llvm/test/CodeGen/AMDGPU/elf-notes.ll
+++ b/llvm/test/CodeGen/AMDGPU/elf-notes.ll
@@ -41,13 +41,15 @@
; OSABI-HSA-ELF: ---
; OSABI-HSA-ELF: Version: [ 1, 0 ]
; OSABI-HSA-ELF: Kernels:
-; OSABI-HSA-ELF: - Name: elf_notes
+; OSABI-HSA-ELF: - Name: elf_notes
+; OSABI-HSA-ELF: SymbolName: 'elf_notes@kd'
; OSABI-HSA-ELF: CodeProps:
-; OSABI-HSA-ELF: WavefrontNumSGPRs: 96
-; OSABI-HSA-ELF: KernargSegmentAlign: 32
-; OSABI-HSA-ELF: GroupSegmentAlign: 4
-; OSABI-HSA-ELF: PrivateSegmentAlign: 4
-; OSABI-HSA-ELF: WavefrontSize: 6
+; OSABI-HSA-ELF: KernargSegmentSize: 0
+; OSABI-HSA-ELF: GroupSegmentFixedSize: 0
+; OSABI-HSA-ELF: PrivateSegmentFixedSize: 0
+; OSABI-HSA-ELF: KernargSegmentAlign: 4
+; OSABI-HSA-ELF: WavefrontSize: 64
+; OSABI-HSA-ELF: NumSGPRs: 96
; OSABI-HSA-ELF: ...
; OSABI-HSA-ELF-NOT: Unknown note type
; OSABI-HSA-ELF-NOT: NT_AMD_AMDGPU_PAL_METADATA (PAL Metadata)
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 508bef0..c07c555 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-deduce-ro-arg.ll
@@ -1,24 +1,24 @@
; RUN: llc -mtriple=amdgcn-amd-amdhsa -filetype=obj -o - < %s | llvm-readobj -elf-output-style=GNU -notes | FileCheck %s
; CHECK: - Name: test_ro_arg
-; CHECK: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: SymbolName: 'test_ro_arg@kd'
+; CHECK-NEXT: Args:
+; CHECK-NEXT: - TypeName: 'float*'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: F32
-; CHECK-NEXT: AccQual: ReadOnly
; CHECK-NEXT: AddrSpaceQual: Global
+; CHECK-NEXT: AccQual: ReadOnly
; CHECK-NEXT: IsConst: true
; CHECK-NEXT: IsRestrict: true
-; CHECK-NEXT: TypeName: 'float*'
-
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'float*'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: F32
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: 'float*'
+; CHECK-NEXT: AccQual: Default
define amdgpu_kernel void @test_ro_arg(float addrspace(1)* noalias readonly %in, float addrspace(1)* %out)
!kernel_arg_addr_space !0 !kernel_arg_access_qual !1 !kernel_arg_type !2
@@ -30,4 +30,3 @@
!1 = !{!"none", !"none"}
!2 = !{!"float*", !"float*"}
!3 = !{!"const restrict", !""}
-
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 da7be20..4ac9bac 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
@@ -1,3 +1,6 @@
+; 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 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s
; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx800 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s
; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -amdgpu-dump-hsa-metadata -amdgpu-verify-hsa-metadata -filetype=obj -o - < %s 2>&1 | FileCheck --check-prefix=PARSER %s
@@ -21,15 +24,16 @@
; CHECK: Kernels:
; CHECK: - Name: test_char
+; CHECK-NEXT: SymbolName: 'test_char@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 1
+; CHECK-NEXT: - TypeName: char
+; CHECK-NEXT: Size: 1
; CHECK-NEXT: Align: 1
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: char
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -54,15 +58,16 @@
}
; CHECK: - Name: test_ushort2
+; CHECK-NEXT: SymbolName: 'test_ushort2@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: - TypeName: ushort2
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: U16
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: ushort2
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -87,15 +92,16 @@
}
; CHECK: - Name: test_int3
+; CHECK-NEXT: SymbolName: 'test_int3@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 16
+; CHECK-NEXT: - TypeName: int3
+; CHECK-NEXT: Size: 16
; CHECK-NEXT: Align: 16
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: I32
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: int3
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -120,15 +126,16 @@
}
; CHECK: - Name: test_ulong4
+; CHECK-NEXT: SymbolName: 'test_ulong4@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 32
+; CHECK-NEXT: - TypeName: ulong4
+; CHECK-NEXT: Size: 32
; CHECK-NEXT: Align: 32
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: U64
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: ulong4
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -153,15 +160,16 @@
}
; CHECK: - Name: test_half8
+; CHECK-NEXT: SymbolName: 'test_half8@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 16
+; CHECK-NEXT: - TypeName: half8
+; CHECK-NEXT: Size: 16
; CHECK-NEXT: Align: 16
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: F16
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: half8
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -186,15 +194,16 @@
}
; CHECK: - Name: test_float16
+; CHECK-NEXT: SymbolName: 'test_float16@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 64
+; CHECK-NEXT: - TypeName: float16
+; CHECK-NEXT: Size: 64
; CHECK-NEXT: Align: 64
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: F32
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: float16
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -219,15 +228,16 @@
}
; CHECK: - Name: test_double16
+; CHECK-NEXT: SymbolName: 'test_double16@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 128
+; CHECK-NEXT: - TypeName: double16
+; CHECK-NEXT: Size: 128
; CHECK-NEXT: Align: 128
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: F64
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: double16
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -252,16 +262,17 @@
}
; CHECK: - Name: test_pointer
+; CHECK-NEXT: SymbolName: 'test_pointer@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'int *'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: I32
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: 'int *'
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -286,16 +297,17 @@
}
; CHECK: - Name: test_image
+; CHECK-NEXT: SymbolName: 'test_image@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: image2d_t
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: Image
; CHECK-NEXT: ValueType: Struct
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: image2d_t
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -320,15 +332,16 @@
}
; CHECK: - Name: test_sampler
+; CHECK-NEXT: SymbolName: 'test_sampler@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: - TypeName: sampler_t
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: Sampler
; CHECK-NEXT: ValueType: I32
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: sampler_t
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -353,16 +366,17 @@
}
; CHECK: - Name: test_queue
+; CHECK-NEXT: SymbolName: 'test_queue@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: queue_t
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: Queue
; CHECK-NEXT: ValueType: Struct
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: queue_t
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -387,16 +401,17 @@
}
; CHECK: - Name: test_struct
+; CHECK-NEXT: SymbolName: 'test_struct@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: - TypeName: struct A
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: Struct
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Private
-; CHECK-NEXT: TypeName: struct A
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -421,15 +436,16 @@
}
; CHECK: - Name: test_i128
+; CHECK-NEXT: SymbolName: 'test_i128@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 16
+; CHECK-NEXT: - TypeName: i128
+; CHECK-NEXT: Size: 16
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: Struct
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: i128
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -454,27 +470,28 @@
}
; CHECK: - Name: test_multi_arg
+; CHECK-NEXT: SymbolName: 'test_multi_arg@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
-; CHECK-NEXT: - Size: 4
+; 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: short2
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: - TypeName: char3
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: char3
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -499,31 +516,32 @@
}
; CHECK: - Name: test_addr_space
+; CHECK-NEXT: SymbolName: 'test_addr_space@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'int *'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: I32
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: 'int *'
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'int *'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: I32
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Constant
-; CHECK-NEXT: TypeName: 'int *'
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'int *'
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: DynamicSharedPointer
; CHECK-NEXT: ValueType: I32
; CHECK-NEXT: PointeeAlign: 4
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Local
-; CHECK-NEXT: TypeName: 'int *'
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -550,34 +568,35 @@
}
; CHECK: - Name: test_type_qual
+; CHECK-NEXT: SymbolName: 'test_type_qual@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'int *'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: I32
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: IsVolatile: true
-; CHECK-NEXT: TypeName: 'int *'
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'int *'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: I32
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: IsConst: true
; CHECK-NEXT: IsRestrict: true
-; CHECK-NEXT: TypeName: 'int *'
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'int *'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: Pipe
; CHECK-NEXT: ValueType: Struct
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: IsPipe: true
-; CHECK-NEXT: TypeName: 'int *'
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -604,30 +623,31 @@
}
; CHECK: - Name: test_access_qual
+; CHECK-NEXT: SymbolName: 'test_access_qual@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; 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: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: image1d_t
-; CHECK-NEXT: - Size: 8
+; 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: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: image2d_t
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: image3d_t
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: Image
; CHECK-NEXT: ValueType: Struct
-; CHECK-NEXT: AccQual: ReadWrite
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: image3d_t
+; CHECK-NEXT: AccQual: ReadWrite
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -654,17 +674,18 @@
}
; CHECK: - Name: test_vec_type_hint_half
+; CHECK-NEXT: SymbolName: 'test_vec_type_hint_half@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: VecTypeHint: half
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -689,17 +710,18 @@
}
; CHECK: - Name: test_vec_type_hint_float
+; CHECK-NEXT: SymbolName: 'test_vec_type_hint_float@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: VecTypeHint: float
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -724,17 +746,18 @@
}
; CHECK: - Name: test_vec_type_hint_double
+; CHECK-NEXT: SymbolName: 'test_vec_type_hint_double@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: VecTypeHint: double
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -759,17 +782,18 @@
}
; CHECK: - Name: test_vec_type_hint_char
+; CHECK-NEXT: SymbolName: 'test_vec_type_hint_char@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: VecTypeHint: char
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -794,17 +818,18 @@
}
; CHECK: - Name: test_vec_type_hint_short
+; CHECK-NEXT: SymbolName: 'test_vec_type_hint_short@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: VecTypeHint: short
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -829,17 +854,18 @@
}
; CHECK: - Name: test_vec_type_hint_long
+; CHECK-NEXT: SymbolName: 'test_vec_type_hint_long@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: VecTypeHint: long
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -864,17 +890,18 @@
}
; CHECK: - Name: test_vec_type_hint_unknown
+; CHECK-NEXT: SymbolName: 'test_vec_type_hint_unknown@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: VecTypeHint: unknown
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -899,18 +926,19 @@
}
; CHECK: - Name: test_reqd_wgs_vec_type_hint
+; CHECK-NEXT: SymbolName: 'test_reqd_wgs_vec_type_hint@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: ReqdWorkGroupSize: [ 1, 2, 4 ]
; CHECK-NEXT: VecTypeHint: int
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -936,18 +964,19 @@
}
; CHECK: - Name: test_wgs_hint_vec_type_hint
+; CHECK-NEXT: SymbolName: 'test_wgs_hint_vec_type_hint@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: WorkGroupSizeHint: [ 8, 16, 32 ]
; CHECK-NEXT: VecTypeHint: uint4
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; 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: int
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -973,16 +1002,17 @@
}
; CHECK: - Name: test_arg_ptr_to_ptr
+; CHECK-NEXT: SymbolName: 'test_arg_ptr_to_ptr@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'int **'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: I32
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: 'int **'
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -1007,16 +1037,17 @@
}
; CHECK: - Name: test_arg_struct_contains_ptr
+; CHECK-NEXT: SymbolName: 'test_arg_struct_contains_ptr@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: - TypeName: struct B
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: Struct
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Private
-; CHECK-NEXT: TypeName: struct B
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -1041,15 +1072,16 @@
}
; CHECK: - Name: test_arg_vector_of_ptr
+; CHECK-NEXT: SymbolName: 'test_arg_vector_of_ptr@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 16
+; CHECK-NEXT: - TypeName: 'global int* __attribute__((ext_vector_type(2)))'
+; CHECK-NEXT: Size: 16
; CHECK-NEXT: Align: 16
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: I32
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: 'global int* __attribute__((ext_vector_type(2)))'
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -1074,16 +1106,17 @@
}
; CHECK: - Name: test_arg_unknown_builtin_type
+; CHECK-NEXT: SymbolName: 'test_arg_unknown_builtin_type@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: clk_event_t
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: Struct
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: clk_event_t
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -1109,64 +1142,65 @@
}
; CHECK: - Name: test_pointee_align
+; CHECK-NEXT: SymbolName: 'test_pointee_align@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 8
+; CHECK-NEXT: - TypeName: 'long *'
+; CHECK-NEXT: Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: GlobalBuffer
; CHECK-NEXT: ValueType: I64
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Global
-; CHECK-NEXT: TypeName: 'long *'
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'char *'
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: DynamicSharedPointer
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: PointeeAlign: 1
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Local
-; CHECK-NEXT: TypeName: 'char *'
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'char2 *'
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: DynamicSharedPointer
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: PointeeAlign: 2
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Local
-; CHECK-NEXT: TypeName: 'char2 *'
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'char3 *'
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: DynamicSharedPointer
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: PointeeAlign: 4
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Local
-; CHECK-NEXT: TypeName: 'char3 *'
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'char4 *'
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: DynamicSharedPointer
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: PointeeAlign: 4
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Local
-; CHECK-NEXT: TypeName: 'char4 *'
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'char8 *'
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: DynamicSharedPointer
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: PointeeAlign: 8
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Local
-; CHECK-NEXT: TypeName: 'char8 *'
-; CHECK-NEXT: - Size: 4
+; CHECK-NEXT: AccQual: Default
+; CHECK-NEXT: - TypeName: 'char16 *'
+; CHECK-NEXT: Size: 4
; CHECK-NEXT: Align: 4
; CHECK-NEXT: ValueKind: DynamicSharedPointer
; CHECK-NEXT: ValueType: I8
; CHECK-NEXT: PointeeAlign: 16
-; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: AddrSpaceQual: Local
-; CHECK-NEXT: TypeName: 'char16 *'
+; CHECK-NEXT: AccQual: Default
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
@@ -1197,17 +1231,18 @@
}
; CHECK: - Name: __test_block_invoke_kernel
+; CHECK-NEXT: SymbolName: '__test_block_invoke_kernel@kd'
; CHECK-NEXT: Language: OpenCL C
; CHECK-NEXT: LanguageVersion: [ 2, 0 ]
; CHECK-NEXT: Attrs:
; CHECK-NEXT: RuntimeHandle: __test_block_invoke_kernel_runtime_handle
; CHECK-NEXT: Args:
-; CHECK-NEXT: - Size: 25
+; CHECK-NEXT: - TypeName: __block_literal
+; CHECK-NEXT: Size: 25
; CHECK-NEXT: Align: 1
; CHECK-NEXT: ValueKind: ByValue
; CHECK-NEXT: ValueType: Struct
; CHECK-NEXT: AccQual: Default
-; CHECK-NEXT: TypeName: __block_literal
; CHECK-NEXT: - Size: 8
; CHECK-NEXT: Align: 8
; CHECK-NEXT: ValueKind: HiddenGlobalOffsetX
diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll
index a29f86d..286f573 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-images.ll
@@ -19,44 +19,45 @@
; CHECK: Version: [ 1, 0 ]
; CHECK: Kernels:
-; CHECK: - Name: test
+; CHECK: - Name: test
+; CHECK: SymbolName: 'test@kd'
; CHECK: Args:
-; CHECK: - Size: 8
+; CHECK: - TypeName: image1d_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image1d_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image1d_array_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image1d_array_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image1d_buffer_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image1d_buffer_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_array_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_array_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_array_depth_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_array_depth_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_array_msaa_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_array_msaa_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_array_msaa_depth_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_array_msaa_depth_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_depth_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_depth_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_msaa_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_msaa_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image2d_msaa_depth_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image2d_msaa_depth_t
-; CHECK: - Size: 8
+; CHECK: - TypeName: image3d_t
+; CHECK: Size: 8
; CHECK: ValueKind: Image
-; CHECK: TypeName: image3d_t
define amdgpu_kernel void @test(%opencl.image1d_t addrspace(1)* %a,
%opencl.image1d_array_t addrspace(1)* %b,
%opencl.image1d_buffer_t addrspace(1)* %c,
diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
index c10c69a..ae839bb 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
@@ -6,19 +6,20 @@
; CHECK: Version: [ 1, 0 ]
; CHECK: Kernels:
-; CHECK: - Name: test
+; CHECK: - Name: test
+; CHECK: SymbolName: 'test@kd'
; CHECK: CodeProps:
; CHECK: KernargSegmentSize: 24
-; GFX700: WavefrontNumSGPRs: 6
-; GFX800: WavefrontNumSGPRs: 96
-; GFX900: WavefrontNumSGPRs: 6
-; GFX700: WorkitemNumVGPRs: 4
-; GFX800: WorkitemNumVGPRs: 6
-; GFX900: WorkitemNumVGPRs: 6
-; CHECK: KernargSegmentAlign: 4
-; CHECK: GroupSegmentAlign: 4
-; CHECK: PrivateSegmentAlign: 4
-; CHECK: WavefrontSize: 6
+; CHECK: GroupSegmentFixedSize: 0
+; CHECK: PrivateSegmentFixedSize: 0
+; CHECK: KernargSegmentAlign: 8
+; CHECK: WavefrontSize: 64
+; GFX700: NumSGPRs: 6
+; GFX800: NumSGPRs: 96
+; GFX900: NumSGPRs: 6
+; GFX700: NumVGPRs: 4
+; GFX800: NumVGPRs: 6
+; GFX900: NumVGPRs: 6
define amdgpu_kernel void @test(
half addrspace(1)* %r,
half addrspace(1)* %a,
diff --git a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-debug-props.ll b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-debug-props.ll
index a863945..f9b94d1 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-debug-props.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa-metadata-kernel-debug-props.ll
@@ -8,7 +8,8 @@
; CHECK: Version: [ 1, 0 ]
; CHECK: Kernels:
-; CHECK: - Name: test
+; CHECK: - Name: test
+; CHECK: SymbolName: 'test@kd'
; CHECK: DebugProps:
; CHECK: DebuggerABIVersion: [ 1, 0 ]
; CHECK: ReservedNumVGPRs: 4