[AMDGPU] Do not emit isa info as code object metadata

  - It was decided to expose this information through other means (rocr)

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

llvm-svn: 298560

4 files changed, 0 insertions, 146 deletions

diff --git a/llvm/test/MC/AMDGPU/code-object-metadata-isa.s b/llvm/test/MC/AMDGPU/code-object-metadata-isa.s
deleted file mode 100644
index 51d3a2b5559..00000000000
--- a/llvm/test/MC/AMDGPU/code-object-metadata-isa.s
+++ /dev/null
@@ -1,98 +0,0 @@
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx700 -show-encoding %s | FileCheck --check-prefix=CHECK --check-prefix=GFX700 %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx800 -show-encoding %s | FileCheck --check-prefix=CHECK --check-prefix=GFX800 %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx900 -show-encoding %s | FileCheck --check-prefix=CHECK --check-prefix=GFX900 %s
-
-// CHECK:  .amdgpu_code_object_metadata
-// CHECK:    Version: [ 1, 0 ]
-// CHECK:    Isa:
-// CHECK:      WavefrontSize:        64
-// CHECK:      LocalMemorySize:      65536
-// CHECK:      EUsPerCU:             4
-// CHECK:      MaxWavesPerEU:        10
-// CHECK:      MaxFlatWorkGroupSize: 2048
-// GFX700:     SGPRAllocGranule:     8
-// GFX800:     SGPRAllocGranule:     16
-// GFX900:     SGPRAllocGranule:     16
-// GFX700:     TotalNumSGPRs:        512
-// GFX800:     TotalNumSGPRs:        800
-// GFX900:     TotalNumSGPRs:        800
-// GFX700:     AddressableNumSGPRs:  104
-// GFX800:     AddressableNumSGPRs:  96
-// GFX900:     AddressableNumSGPRs:  102
-// CHECK:      VGPRAllocGranule:     4
-// CHECK:      TotalNumVGPRs:        256
-// CHECK:      AddressableNumVGPRs:  256
-// CHECK:    Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
-// CHECK:    Kernels:
-// CHECK:      - Name:            test_kernel
-// CHECK:        Language:        OpenCL C
-// CHECK:        LanguageVersion: [ 2, 0 ]
-// CHECK:        Args:
-// CHECK:          - Size:          1
-// CHECK:            Align:         1
-// CHECK:            Kind:          ByValue
-// CHECK:            ValueType:     I8
-// CHECK:            AccQual:       Default
-// CHECK:            TypeName:      char
-// CHECK:          - Size:          8
-// CHECK:            Align:         8
-// CHECK:            Kind:          HiddenGlobalOffsetX
-// CHECK:            ValueType:     I64
-// CHECK:          - Size:          8
-// CHECK:            Align:         8
-// CHECK:            Kind:          HiddenGlobalOffsetY
-// CHECK:            ValueType:     I64
-// CHECK:          - Size:          8
-// CHECK:            Align:         8
-// CHECK:            Kind:          HiddenGlobalOffsetZ
-// CHECK:            ValueType:     I64
-// CHECK:          - Size:          8
-// CHECK:            Align:         8
-// CHECK:            Kind:          HiddenPrintfBuffer
-// CHECK:            ValueType:     I8
-// CHECK:            AddrSpaceQual: Global
-// CHECK:  .end_amdgpu_code_object_metadata
-.amdgpu_code_object_metadata
-  Version: [ 1, 0 ]
-  Isa:
-    WavefrontSize:        1
-    LocalMemorySize:      1
-    EUsPerCU:             1
-    MaxWavesPerEU:        1
-    MaxFlatWorkGroupSize: 1
-    SGPRAllocGranule:     1
-    TotalNumSGPRs:        1
-    AddressableNumSGPRs:  1
-    VGPRAllocGranule:     1
-    TotalNumVGPRs:        1
-    AddressableNumVGPRs:  1
-  Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
-  Kernels:
-    - Name:            test_kernel
-      Language:        OpenCL C
-      LanguageVersion: [ 2, 0 ]
-      Args:
-        - Size:          1
-          Align:         1
-          Kind:          ByValue
-          ValueType:     I8
-          AccQual:       Default
-          TypeName:      char
-        - Size:          8
-          Align:         8
-          Kind:          HiddenGlobalOffsetX
-          ValueType:     I64
-        - Size:          8
-          Align:         8
-          Kind:          HiddenGlobalOffsetY
-          ValueType:     I64
-        - Size:          8
-          Align:         8
-          Kind:          HiddenGlobalOffsetZ
-          ValueType:     I64
-        - Size:          8
-          Align:         8
-          Kind:          HiddenPrintfBuffer
-          ValueType:     I8
-          AddrSpaceQual: Global
-.end_amdgpu_code_object_metadata
diff --git a/llvm/test/MC/AMDGPU/code-object-metadata-kernel-args.s b/llvm/test/MC/AMDGPU/code-object-metadata-kernel-args.s
index 3f3a7f4d172..91c5b67830b 100644
--- a/llvm/test/MC/AMDGPU/code-object-metadata-kernel-args.s
+++ b/llvm/test/MC/AMDGPU/code-object-metadata-kernel-args.s
@@ -4,24 +4,6 @@
 
 // CHECK:  .amdgpu_code_object_metadata
 // CHECK:    Version: [ 1, 0 ]
-// CHECK:    Isa:
-// CHECK:      WavefrontSize:        64
-// CHECK:      LocalMemorySize:      65536
-// CHECK:      EUsPerCU:             4
-// CHECK:      MaxWavesPerEU:        10
-// CHECK:      MaxFlatWorkGroupSize: 2048
-// GFX700:     SGPRAllocGranule:     8
-// GFX800:     SGPRAllocGranule:     16
-// GFX900:     SGPRAllocGranule:     16
-// GFX700:     TotalNumSGPRs:        512
-// GFX800:     TotalNumSGPRs:        800
-// GFX900:     TotalNumSGPRs:        800
-// GFX700:     AddressableNumSGPRs:  104
-// GFX800:     AddressableNumSGPRs:  96
-// GFX900:     AddressableNumSGPRs:  102
-// CHECK:      VGPRAllocGranule:     4
-// CHECK:      TotalNumVGPRs:        256
-// CHECK:      AddressableNumVGPRs:  256
 // CHECK:    Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
 // CHECK:    Kernels:
 // CHECK:      - Name:            test_kernel
diff --git a/llvm/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s b/llvm/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s
index 247012b1c14..9669fcf5393 100644
--- a/llvm/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s
+++ b/llvm/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s
@@ -4,24 +4,6 @@
 
 // CHECK:  .amdgpu_code_object_metadata
 // CHECK:    Version: [ 1, 0 ]
-// CHECK:    Isa:
-// CHECK:      WavefrontSize:        64
-// CHECK:      LocalMemorySize:      65536
-// CHECK:      EUsPerCU:             4
-// CHECK:      MaxWavesPerEU:        10
-// CHECK:      MaxFlatWorkGroupSize: 2048
-// GFX700:     SGPRAllocGranule:     8
-// GFX800:     SGPRAllocGranule:     16
-// GFX900:     SGPRAllocGranule:     16
-// GFX700:     TotalNumSGPRs:        512
-// GFX800:     TotalNumSGPRs:        800
-// GFX900:     TotalNumSGPRs:        800
-// GFX700:     AddressableNumSGPRs:  104
-// GFX800:     AddressableNumSGPRs:  96
-// GFX900:     AddressableNumSGPRs:  102
-// CHECK:      VGPRAllocGranule:     4
-// CHECK:      TotalNumVGPRs:        256
-// CHECK:      AddressableNumVGPRs:  256
 // CHECK:    Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
 // CHECK:    Kernels:
 // CHECK:      - Name:            test_kernel
diff --git a/llvm/test/MC/AMDGPU/hsa.s b/llvm/test/MC/AMDGPU/hsa.s
index dd60f3e9763..5f1297e0f37 100644
--- a/llvm/test/MC/AMDGPU/hsa.s
+++ b/llvm/test/MC/AMDGPU/hsa.s
@@ -46,18 +46,6 @@
 
 // ASM: .amdgpu_code_object_metadata
 // ASM:    Version: [ 3, 0 ]
-// ASM:    Isa:
-// ASM:      WavefrontSize:        64
-// ASM:      LocalMemorySize:      65536
-// ASM:      EUsPerCU:             4
-// ASM:      MaxWavesPerEU:        10
-// ASM:      MaxFlatWorkGroupSize: 2048
-// ASM:      SGPRAllocGranule:     8
-// ASM:      TotalNumSGPRs:        512
-// ASM:      AddressableNumSGPRs:  104
-// ASM:      VGPRAllocGranule:     4
-// ASM:      TotalNumVGPRs:        256
-// ASM:      AddressableNumVGPRs:  256
 // ASM:    Kernels:
 // ASM:      - Name: amd_kernel_code_t_test_all
 // ASM:      - Name: amd_kernel_code_t_minimal