From 5556d8485b8b64095a7f097b44c01f1b379ba094 Mon Sep 17 00:00:00 2001 From: Konstantin Zhuravlyov Date: Sat, 14 Oct 2017 19:03:51 +0000 Subject: AMDGPU: Bring HSA metadata on par with the specification Differential Revision: https://reviews.llvm.org/D38753 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315821 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/MC/AMDGPU/hsa-metadata-kernel-args.s | 10 ++++++---- test/MC/AMDGPU/hsa-metadata-kernel-attrs.s | 2 ++ test/MC/AMDGPU/hsa-metadata-kernel-code-props.s | 22 +++++++++++++--------- test/MC/AMDGPU/hsa-metadata-kernel-debug-props.s | 4 +++- test/MC/AMDGPU/hsa-metadata-unknown-key.s | 1 + test/MC/AMDGPU/hsa.s | 12 ++++++++---- 6 files changed, 33 insertions(+), 18 deletions(-) (limited to 'test/MC/AMDGPU') diff --git a/test/MC/AMDGPU/hsa-metadata-kernel-args.s b/test/MC/AMDGPU/hsa-metadata-kernel-args.s index 3416fff2814..2f9960ffaa0 100644 --- a/test/MC/AMDGPU/hsa-metadata-kernel-args.s +++ b/test/MC/AMDGPU/hsa-metadata-kernel-args.s @@ -9,15 +9,16 @@ // CHECK: - '2:1:8:%g\n' // CHECK: Kernels: // CHECK: - Name: test_kernel +// CHECK: SymbolName: 'test_kernel@kd' // CHECK: Language: OpenCL C // CHECK: LanguageVersion: [ 2, 0 ] // CHECK: Args: -// CHECK: - Size: 1 +// CHECK: - TypeName: char +// CHECK: Size: 1 // CHECK: Align: 1 // CHECK: ValueKind: ByValue // CHECK: ValueType: I8 // CHECK: AccQual: Default -// CHECK: TypeName: char // CHECK: - Size: 8 // CHECK: Align: 8 // CHECK: ValueKind: HiddenGlobalOffsetX @@ -41,15 +42,16 @@ Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ] Kernels: - Name: test_kernel + SymbolName: test_kernel@kd Language: OpenCL C LanguageVersion: [ 2, 0 ] Args: - - Size: 1 + - TypeName: char + Size: 1 Align: 1 ValueKind: ByValue ValueType: I8 AccQual: Default - TypeName: char - Size: 8 Align: 8 ValueKind: HiddenGlobalOffsetX diff --git a/test/MC/AMDGPU/hsa-metadata-kernel-attrs.s b/test/MC/AMDGPU/hsa-metadata-kernel-attrs.s index 525d25e521d..5a9fdd22069 100644 --- a/test/MC/AMDGPU/hsa-metadata-kernel-attrs.s +++ b/test/MC/AMDGPU/hsa-metadata-kernel-attrs.s @@ -9,6 +9,7 @@ // CHECK: - '2:1:8:%g\n' // CHECK: Kernels: // CHECK: - Name: test_kernel +// CHECK: SymbolName: 'test_kernel@kd' // CHECK: Language: OpenCL C // CHECK: LanguageVersion: [ 2, 0 ] // CHECK: Attrs: @@ -21,6 +22,7 @@ Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ] Kernels: - Name: test_kernel + SymbolName: test_kernel@kd Language: OpenCL C LanguageVersion: [ 2, 0 ] Attrs: diff --git a/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s b/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s index 062e671357a..e290235b16c 100644 --- a/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s +++ b/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s @@ -5,20 +5,24 @@ // CHECK: .amd_amdgpu_hsa_metadata // CHECK: Version: [ 1, 0 ] // CHECK: Kernels: -// CHECK: - Name: test_kernel +// CHECK: - Name: test_kernel +// CHECK: SymbolName: 'test_kernel@kd' // CHECK: CodeProps: -// CHECK: KernargSegmentSize: 24 -// CHECK: WorkitemPrivateSegmentSize: 16 -// CHECK: WavefrontNumSGPRs: 6 -// CHECK: WorkitemNumVGPRs: 12 +// CHECK: KernargSegmentSize: 24 +// CHECK: GroupSegmentFixedSize: 24 +// CHECK: PrivateSegmentFixedSize: 16 +// CHECK: KernargSegmentAlign: 16 +// CHECK: WavefrontSize: 64 .amd_amdgpu_hsa_metadata Version: [ 1, 0 ] Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ] Kernels: - Name: test_kernel + SymbolName: test_kernel@kd CodeProps: - KernargSegmentSize: 24 - WorkitemPrivateSegmentSize: 16 - WavefrontNumSGPRs: 6 - WorkitemNumVGPRs: 12 + KernargSegmentSize: 24 + GroupSegmentFixedSize: 24 + PrivateSegmentFixedSize: 16 + KernargSegmentAlign: 16 + WavefrontSize: 64 .end_amd_amdgpu_hsa_metadata diff --git a/test/MC/AMDGPU/hsa-metadata-kernel-debug-props.s b/test/MC/AMDGPU/hsa-metadata-kernel-debug-props.s index 950049d115e..7efb8207ae4 100644 --- a/test/MC/AMDGPU/hsa-metadata-kernel-debug-props.s +++ b/test/MC/AMDGPU/hsa-metadata-kernel-debug-props.s @@ -5,7 +5,8 @@ // CHECK: .amd_amdgpu_hsa_metadata // CHECK: Version: [ 1, 0 ] // CHECK: Kernels: -// CHECK: - Name: test_kernel +// CHECK: - Name: test_kernel +// CHECK: SymbolName: 'test_kernel@kd' // CHECK: DebugProps: // CHECK: DebuggerABIVersion: [ 1, 0 ] // CHECK: ReservedNumVGPRs: 4 @@ -17,6 +18,7 @@ Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ] Kernels: - Name: test_kernel + SymbolName: test_kernel@kd DebugProps: DebuggerABIVersion: [ 1, 0 ] ReservedNumVGPRs: 4 diff --git a/test/MC/AMDGPU/hsa-metadata-unknown-key.s b/test/MC/AMDGPU/hsa-metadata-unknown-key.s index 58d40209831..f532930c7c6 100644 --- a/test/MC/AMDGPU/hsa-metadata-unknown-key.s +++ b/test/MC/AMDGPU/hsa-metadata-unknown-key.s @@ -12,6 +12,7 @@ Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ] Kernels: - Name: test_kernel + SymbolName: test_kernel@kd Language: OpenCL C LanguageVersion: [ 2, 0 ] Args: diff --git a/test/MC/AMDGPU/hsa.s b/test/MC/AMDGPU/hsa.s index 710f115adb1..82136fbca8b 100644 --- a/test/MC/AMDGPU/hsa.s +++ b/test/MC/AMDGPU/hsa.s @@ -40,15 +40,19 @@ .amd_amdgpu_hsa_metadata Version: [ 3, 0 ] Kernels: - - Name: amd_kernel_code_t_test_all - - Name: amd_kernel_code_t_minimal + - Name: amd_kernel_code_t_test_all + SymbolName: amd_kernel_code_t_test_all@kd + - Name: amd_kernel_code_t_minimal + SymbolName: amd_kernel_code_t_minimal@kd .end_amd_amdgpu_hsa_metadata // ASM: .amd_amdgpu_hsa_metadata // ASM: Version: [ 3, 0 ] // ASM: Kernels: -// ASM: - Name: amd_kernel_code_t_test_all -// ASM: - Name: amd_kernel_code_t_minimal +// ASM: - Name: amd_kernel_code_t_test_all +// ASM: SymbolName: 'amd_kernel_code_t_test_all@kd' +// ASM: - Name: amd_kernel_code_t_minimal +// ASM: SymbolName: 'amd_kernel_code_t_minimal@kd' // ASM: .end_amd_amdgpu_hsa_metadata .amdgpu_hsa_kernel amd_kernel_code_t_test_all -- cgit v1.2.3