From: Matt Arsenault <Matthew.Arsenault@amd.com>
Date: Wed, 3 Jul 2019 21:34:34 +0000 (+0000)
Subject: Revert "[AMDGPU] Kernel arg metadata: added support for "__hip_texture" type."
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a17e2f9fb8c6e143315a21f56b16535bd5b23b7;p=llvm

Revert "[AMDGPU] Kernel arg metadata: added support for "__hip_texture" type."

This reverts commit r365073.

This is crashing, and is improperly relying on IR type names.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@365087 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp b/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp
index 559910c77e0..236d750fba9 100644
--- a/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp
+++ b/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp
@@ -104,11 +104,6 @@ ValueKind MetadataStreamerV2::getValueKind(Type *Ty, StringRef TypeQual,
   if (TypeQual.find("pipe") != StringRef::npos)
     return ValueKind::Pipe;
 
-  if (isa<PointerType>(Ty) && Ty->getPointerElementType()->isStructTy() &&
-      Ty->getPointerElementType()->getStructName() == "struct.__hip_texture") {
-    return ValueKind::Image;
-  }
-
   return StringSwitch<ValueKind>(BaseTypeName)
              .Case("image1d_t", ValueKind::Image)
              .Case("image1d_array_t", ValueKind::Image)
@@ -546,11 +541,6 @@ StringRef MetadataStreamerV3::getValueKind(Type *Ty, StringRef TypeQual,
   if (TypeQual.find("pipe") != StringRef::npos)
     return "pipe";
 
-  if (isa<PointerType>(Ty) && Ty->getPointerElementType()->isStructTy() &&
-      Ty->getPointerElementType()->getStructName() == "struct.__hip_texture") {
-    return "image";
-  }
-
   return StringSwitch<StringRef>(BaseTypeName)
       .Case("image1d_t", "image")
       .Case("image1d_array_t", "image")
diff --git a/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll b/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll
index c18c58b4406..edcd45a3fbf 100644
--- a/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll
+++ b/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full-v3.ll
@@ -13,7 +13,6 @@
 %opencl.pipe_t = type opaque
 %struct.B = type { i32 addrspace(1)*}
 %opencl.clk_event_t = type opaque
-%struct.__hip_texture = type opaque
 
 @__test_block_invoke_kernel_runtime_handle = external addrspace(1) externally_initialized constant i8 addrspace(1)*
 
@@ -1497,18 +1496,6 @@ define amdgpu_kernel void @unknown_addrspace_kernarg(i32 addrspace(12345)* %ptr)
   ret void
 }
 
-; CHECK:  - .args:           
-; CHECK-NEXT:      - .address_space:  generic
-; CHECK-NEXT:        .offset:         0
-; CHECK-NEXT:        .size:           8
-; CHECK-NEXT:        .value_kind:     image
-; CHECK-NEXT:        .value_type:     struct
-; CHECK:    .name:           _Z5EmptyP13__hip_texture
-; CHECK:    .symbol:         _Z5EmptyP13__hip_texture.kd
-define protected amdgpu_kernel void @_Z5EmptyP13__hip_texture(%struct.__hip_texture* nocapture) local_unnamed_addr #1 {
-  ret void
-}
-
 ; CHECK:  amdhsa.printf:
 ; CHECK-NEXT: - '1:1:4:%d\n'
 ; CHECK-NEXT: - '2:1:8:%g\n'
diff --git a/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll b/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll
index c088dab9885..34373600b47 100644
--- a/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll
+++ b/test/CodeGen/AMDGPU/hsa-metadata-from-llvm-ir-full.ll
@@ -13,7 +13,6 @@
 %opencl.pipe_t = type opaque
 %struct.B = type { i32 addrspace(1)*}
 %opencl.clk_event_t = type opaque
-%struct.__hip_texture = type opaque
 
 @__test_block_invoke_kernel_runtime_handle = external addrspace(1) externally_initialized constant i8 addrspace(1)*
 
@@ -1485,16 +1484,6 @@ define amdgpu_kernel void @unknown_addrspace_kernarg(i32 addrspace(12345)* %ptr)
   ret void
 }
 
-; CHECK: - Name:            _Z5EmptyP13__hip_texture
-; CHECK: Args:
-; CHECK-NEXT:      - Size:            8
-; CHECK-NEXT:        Align:           8
-; CHECK-NEXT:        ValueKind:       Image
-; CHECK-NEXT:        ValueType:       Struct
-define protected amdgpu_kernel void @_Z5EmptyP13__hip_texture(%struct.__hip_texture* nocapture) local_unnamed_addr #1 {
-  ret void
-}
-
 attributes #0 = { "amdgpu-implicitarg-num-bytes"="48" }
 attributes #1 = { "amdgpu-implicitarg-num-bytes"="48" "runtime-handle"="__test_block_invoke_kernel_runtime_handle" }
 attributes #2 = { "amdgpu-implicitarg-num-bytes"="48" "calls-enqueue-kernel" }