This is an archive of the discontinued LLVM Phabricator instance.

Differential D32504

AMDGPU: Fix ValueKind code object metadata for images
ClosedPublic

Authored by kzhuravl on Apr 25 2017, 1:28 PM.

Details

Reviewers
cfang
arsenm
b-sumner
Commits
rG54ba4312a3b1: AMDGPU: Fix ValueKind code object metadata for images
rL301360: AMDGPU: Fix ValueKind code object metadata for images

Diff Detail

Event Timeline

kzhuravl created this revision.Apr 25 2017, 1:28 PM
Herald added subscribers: t-tye, tpr, dstuttard and 3 others. · View Herald TranscriptApr 25 2017, 1:28 PM
arsenm accepted this revision.Apr 25 2017, 1:41 PM

LGTM

This revision is now accepted and ready to land.Apr 25 2017, 1:41 PM
Closed by commit rL301360: AMDGPU: Fix ValueKind code object metadata for images (authored by kzhuravl). · Explain WhyApr 25 2017, 1:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
AMDGPU/
MCTargetDesc/
24 lines
test/
CodeGen/
AMDGPU/
80 lines

Diff 96626

lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.cpp

Show First 20 Lines • Show All 280 Lines • ▼ Show 20 Lines
} }
ValueKind MetadataStreamer::getValueKind(Type *Ty, StringRef TypeQual, ValueKind MetadataStreamer::getValueKind(Type *Ty, StringRef TypeQual,
StringRef BaseTypeName) const { StringRef BaseTypeName) const {
if (TypeQual.find("pipe") != StringRef::npos) if (TypeQual.find("pipe") != StringRef::npos)
return ValueKind::Pipe; return ValueKind::Pipe;
return StringSwitch<ValueKind>(BaseTypeName) return StringSwitch<ValueKind>(BaseTypeName)
.Case("image1d_t", ValueKind::Image)
.Case("image1d_array_t", ValueKind::Image)
.Case("image1d_buffer_t", ValueKind::Image)
.Case("image2d_t", ValueKind::Image)
.Case("image2d_array_t", ValueKind::Image)
.Case("image2d_array_depth_t", ValueKind::Image)
.Case("image2d_array_msaa_t", ValueKind::Image)
.Case("image2d_array_msaa_depth_t", ValueKind::Image)
.Case("image2d_depth_t", ValueKind::Image)
.Case("image2d_msaa_t", ValueKind::Image)
.Case("image2d_msaa_depth_t", ValueKind::Image)
.Case("image3d_t", ValueKind::Image)
.Case("sampler_t", ValueKind::Sampler) .Case("sampler_t", ValueKind::Sampler)
.Case("queue_t", ValueKind::Queue) .Case("queue_t", ValueKind::Queue)
.Cases("image1d_t",
"image1d_array_t",
"image1d_buffer_t",
"image2d_t" ,
"image2d_array_t",
"image2d_array_depth_t",
"image2d_array_msaa_t"
"image2d_array_msaa_depth_t"
"image2d_depth_t",
"image2d_msaa_t",
"image2d_msaa_depth_t",
"image3d_t", ValueKind::Image)
.Default(isa<PointerType>(Ty) ? .Default(isa<PointerType>(Ty) ?
(Ty->getPointerAddressSpace() == (Ty->getPointerAddressSpace() ==
AMDGPUASI.LOCAL_ADDRESS ? AMDGPUASI.LOCAL_ADDRESS ?
ValueKind::DynamicSharedPointer : ValueKind::DynamicSharedPointer :
ValueKind::GlobalBuffer) : ValueKind::GlobalBuffer) :
ValueKind::ByValue); ValueKind::ByValue);
} }
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines

test/CodeGen/AMDGPU/code-object-metadata-images.ll

; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx700 -filetype=obj -o - < %s | llvm-readobj -amdgpu-code-object-metadata -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 -amdgpu-code-object-metadata -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 -amdgpu-code-object-metadata -elf-output-style=GNU -notes | FileCheck --check-prefix=CHECK --check-prefix=GFX900 --check-prefix=NOTES %s
%opencl.image1d_t = type opaque
%opencl.image1d_array_t = type opaque
%opencl.image1d_buffer_t = type opaque
%opencl.image2d_t = type opaque
%opencl.image2d_array_t = type opaque
%opencl.image2d_array_depth_t = type opaque
%opencl.image2d_array_msaa_t = type opaque
%opencl.image2d_array_msaa_depth_t = type opaque
%opencl.image2d_depth_t = type opaque
%opencl.image2d_msaa_t = type opaque
%opencl.image2d_msaa_depth_t = type opaque
%opencl.image3d_t = type opaque
; CHECK: ---
; CHECK: Version: [ 1, 0 ]
; CHECK: Kernels:
; CHECK: - Name: test
; CHECK: Args:
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image1d_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image1d_array_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image1d_buffer_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_array_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_array_depth_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_array_msaa_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_array_msaa_depth_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_depth_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_msaa_t
; CHECK: - Size: 8
; CHECK: ValueKind: Image
; CHECK: TypeName: image2d_msaa_depth_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,
%opencl.image2d_t addrspace(1)* %d,
%opencl.image2d_array_t addrspace(1)* %e,
%opencl.image2d_array_depth_t addrspace(1)* %f,
%opencl.image2d_array_msaa_t addrspace(1)* %g,
%opencl.image2d_array_msaa_depth_t addrspace(1)* %h,
%opencl.image2d_depth_t addrspace(1)* %i,
%opencl.image2d_msaa_t addrspace(1)* %j,
%opencl.image2d_msaa_depth_t addrspace(1)* %k,
%opencl.image3d_t addrspace(1)* %l)
!kernel_arg_type !1 !kernel_arg_base_type !1 {
ret void
}
!1 = !{!"image1d_t", !"image1d_array_t", !"image1d_buffer_t",
!"image2d_t", !"image2d_array_t", !"image2d_array_depth_t",
!"image2d_array_msaa_t", !"image2d_array_msaa_depth_t",
!"image2d_depth_t", !"image2d_msaa_t", !"image2d_msaa_depth_t",
!"image3d_t"}