This is an archive of the discontinued LLVM Phabricator instance.

Differential D85048

[mlir] Conversion of ViewOp with memory space to LLVM.
ClosedPublic

Authored by arpith-jacob on Jul 31 2020, 2:55 PM.

Details

Reviewers
ftynse
jpienaar
bondhugula
nicolasvasilache
Commits
rGfab4b59961aa: [mlir] Conversion of ViewOp with memory space to LLVM.
Summary

Handle the case where the ViewOp takes in a memref that has
an memory space.

Diff Detail

Event Timeline

arpith-jacob created this revision.Jul 31 2020, 2:55 PM
Herald added a reviewer: ftynse. · View Herald TranscriptJul 31 2020, 2:55 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: msifontes, jurahul, Kayjukh and 11 others. · View Herald Transcript
arpith-jacob requested review of this revision.Jul 31 2020, 2:55 PM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald TranscriptJul 31 2020, 2:55 PM
arpith-jacob added a reviewer: jpienaar.Jul 31 2020, 2:55 PM
Harbormaster completed remote builds in B66613: Diff 282321.Jul 31 2020, 3:09 PM
bondhugula requested changes to this revision.Aug 1 2020, 12:14 AM
bondhugula added a subscriber: bondhugula.
bondhugula added inline comments.
mlir/lib/Conversion/StandardToLLVM/StandardToLLVM.cpp
2946

memRefType -> srcMemRefType

mlir/test/Conversion/StandardToLLVM/convert-to-llvmir.mlir
827

address space -> memory space

Here and in the commit title/summary to be consistent with the terminology in langref and elsewhere.

This revision now requires changes to proceed.Aug 1 2020, 12:14 AM
arpith-jacob retitled this revision from [mlir] Conversion of ViewOp with address space to LLVM. to [mlir] Conversion of ViewOp with memory space to LLVM..Aug 3 2020, 8:55 AM
arpith-jacob edited the summary of this revision. (Show Details)
arpith-jacob updated this revision to Diff 282641.Aug 3 2020, 8:56 AM
arpith-jacob retitled this revision from [mlir] Conversion of ViewOp with memory space to LLVM. to [mlir] Conversion of ViewOp with address space to LLVM..
arpith-jacob edited the summary of this revision. (Show Details)

Addressed comments. PTAL.

Harbormaster completed remote builds in B66781: Diff 282641.Aug 3 2020, 9:17 AM
ftynse accepted this revision.Aug 4 2020, 1:40 AM

LGTM!

bondhugula accepted this revision.Aug 4 2020, 2:02 AM
This revision is now accepted and ready to land.Aug 4 2020, 2:02 AM
nicolasvasilache added a comment.Aug 4 2020, 2:05 AM

Thanks @arpith-jacob

nicolasvasilache accepted this revision.Aug 4 2020, 3:29 AM
arpith-jacob updated this revision to Diff 282980.Aug 4 2020, 11:37 AM

Rebase

arpith-jacob updated this revision to Diff 282989.Aug 4 2020, 11:53 AM

Rebase

Harbormaster completed remote builds in B66969: Diff 282980.Aug 4 2020, 12:08 PM
Harbormaster completed remote builds in B66975: Diff 282989.Aug 4 2020, 12:21 PM
arpith-jacob retitled this revision from [mlir] Conversion of ViewOp with address space to LLVM. to [mlir] Conversion of ViewOp with memory space to LLVM..Aug 4 2020, 1:58 PM
arpith-jacob edited the summary of this revision. (Show Details)
arpith-jacob added a comment.Aug 4 2020, 9:50 PM

Can someone with commit access land this patch? Thanks.

Closed by commit rGfab4b59961aa: [mlir] Conversion of ViewOp with memory space to LLVM. (authored by arpith-jacob, committed by ftynse). · Explain WhyAug 5 2020, 3:20 AM
This revision was automatically updated to reflect the committed changes.
ftynse added a commit: rGfab4b59961aa: [mlir] Conversion of ViewOp with memory space to LLVM..

Revision Contents

PathSize
mlir/
lib/
Conversion/
StandardToLLVM/
7 lines
test/
Conversion/
StandardToLLVM/
22 lines

Diff 282321

mlir/lib/Conversion/StandardToLLVM/StandardToLLVM.cpp

Show First 20 Lines • Show All 2,937 Lines • ▼ Show 20 Lines matchAndRewrite(Operation *op, ArrayRef<Value> operands,
assert(offset == 0 && "expected offset to be 0"); assert(offset == 0 && "expected offset to be 0");
// Create the descriptor. // Create the descriptor.
MemRefDescriptor sourceMemRef(adaptor.source()); MemRefDescriptor sourceMemRef(adaptor.source());
auto targetMemRef = MemRefDescriptor::undef(rewriter, loc, targetDescTy); auto targetMemRef = MemRefDescriptor::undef(rewriter, loc, targetDescTy);
// Field 1: Copy the allocated pointer, used for malloc/free. // Field 1: Copy the allocated pointer, used for malloc/free.
Value allocatedPtr = sourceMemRef.allocatedPtr(rewriter, loc); Value allocatedPtr = sourceMemRef.allocatedPtr(rewriter, loc);
auto memRefType = viewOp.source().getType().cast<MemRefType>();
bondhugulaUnsubmitted
Not Done
ReplyInline Actions

memRefType -> srcMemRefType

bondhugula: memRefType -> srcMemRefType
Value bitcastPtr = rewriter.create<LLVM::BitcastOp>( Value bitcastPtr = rewriter.create<LLVM::BitcastOp>(
loc, targetElementTy.getPointerTo(), allocatedPtr); loc, targetElementTy.getPointerTo(memRefType.getMemorySpace()),
allocatedPtr);
targetMemRef.setAllocatedPtr(rewriter, loc, bitcastPtr); targetMemRef.setAllocatedPtr(rewriter, loc, bitcastPtr);
// Field 2: Copy the actual aligned pointer to payload. // Field 2: Copy the actual aligned pointer to payload.
Value alignedPtr = sourceMemRef.alignedPtr(rewriter, loc); Value alignedPtr = sourceMemRef.alignedPtr(rewriter, loc);
alignedPtr = rewriter.create<LLVM::GEPOp>(loc, alignedPtr.getType(), alignedPtr = rewriter.create<LLVM::GEPOp>(loc, alignedPtr.getType(),
alignedPtr, adaptor.byte_shift()); alignedPtr, adaptor.byte_shift());
bitcastPtr = rewriter.create<LLVM::BitcastOp>( bitcastPtr = rewriter.create<LLVM::BitcastOp>(
loc, targetElementTy.getPointerTo(), alignedPtr); loc, targetElementTy.getPointerTo(memRefType.getMemorySpace()),
alignedPtr);
targetMemRef.setAlignedPtr(rewriter, loc, bitcastPtr); targetMemRef.setAlignedPtr(rewriter, loc, bitcastPtr);
// Field 3: The offset in the resulting type must be 0. This is because of // Field 3: The offset in the resulting type must be 0. This is because of
// the type change: an offset on srcType* may not be expressible as an // the type change: an offset on srcType* may not be expressible as an
// offset on dstType*. // offset on dstType*.
targetMemRef.setOffset(rewriter, loc, targetMemRef.setOffset(rewriter, loc,
createIndexConstant(rewriter, loc, offset)); createIndexConstant(rewriter, loc, offset));
▲ Show 20 Lines • Show All 456 Lines • Show Last 20 Lines

mlir/test/Conversion/StandardToLLVM/convert-to-llvmir.mlir

Show First 20 Lines • Show All 818 Lines • ▼ Show 20 Linesfunc @view(%arg0 : index, %arg1 : index, %arg2 : index) {
// CHECK: llvm.mlir.constant(1 : index) : !llvm.i64 // CHECK: llvm.mlir.constant(1 : index) : !llvm.i64
// CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[4, 1] : !llvm<"{ float*, float*, i64, [2 x i64], [2 x i64] }"> // CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[4, 1] : !llvm<"{ float*, float*, i64, [2 x i64], [2 x i64] }">
// CHECK: llvm.mlir.constant(64 : index) : !llvm.i64 // CHECK: llvm.mlir.constant(64 : index) : !llvm.i64
// CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[3, 0] : !llvm<"{ float*, float*, i64, [2 x i64], [2 x i64] }"> // CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[3, 0] : !llvm<"{ float*, float*, i64, [2 x i64], [2 x i64] }">
// CHECK: llvm.mlir.constant(4 : index) : !llvm.i64 // CHECK: llvm.mlir.constant(4 : index) : !llvm.i64
// CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[4, 0] : !llvm<"{ float*, float*, i64, [2 x i64], [2 x i64] }"> // CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[4, 0] : !llvm<"{ float*, float*, i64, [2 x i64], [2 x i64] }">
%5 = view %0[%arg2][] : memref<2048xi8> to memref<64x4xf32> %5 = view %0[%arg2][] : memref<2048xi8> to memref<64x4xf32>
// Test view address space.
bondhugulaUnsubmitted
Not Done
ReplyInline Actions

address space -> memory space

Here and in the commit title/summary to be consistent with the terminology in langref and elsewhere.

bondhugula: `address space` -> `memory space` Here and in the commit title/summary to be consistent with…
// CHECK: llvm.mlir.constant(2048 : index) : !llvm.i64
// CHECK: llvm.mlir.undef : !llvm<"{ i8 addrspace(4)*, i8 addrspace(4)*, i64, [1 x i64], [1 x i64] }">
%6 = alloc() : memref<2048xi8, 4>
// CHECK: llvm.mlir.undef : !llvm<"{ float addrspace(4)*, float addrspace(4)*, i64, [2 x i64], [2 x i64] }">
// CHECK: %[[BASE_PTR_4:.*]] = llvm.extractvalue %{{.*}}[1] : !llvm<"{ i8 addrspace(4)*, i8 addrspace(4)*, i64, [1 x i64], [1 x i64] }">
// CHECK: %[[SHIFTED_BASE_PTR_4:.*]] = llvm.getelementptr %[[BASE_PTR_4]][%[[ARG2]]] : (!llvm<"i8 addrspace(4)*">, !llvm.i64) -> !llvm<"i8 addrspace(4)*">
// CHECK: %[[CAST_SHIFTED_BASE_PTR_4:.*]] = llvm.bitcast %[[SHIFTED_BASE_PTR_4]] : !llvm<"i8 addrspace(4)*"> to !llvm<"float addrspace(4)*">
// CHECK: llvm.insertvalue %[[CAST_SHIFTED_BASE_PTR_4]], %{{.*}}[1] : !llvm<"{ float addrspace(4)*, float addrspace(4)*, i64, [2 x i64], [2 x i64] }">
// CHECK: %[[C0_4:.*]] = llvm.mlir.constant(0 : index) : !llvm.i64
// CHECK: llvm.insertvalue %[[C0_4]], %{{.*}}[2] : !llvm<"{ float addrspace(4)*, float addrspace(4)*, i64, [2 x i64], [2 x i64] }">
// CHECK: llvm.mlir.constant(4 : index) : !llvm.i64
// CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[3, 1] : !llvm<"{ float addrspace(4)*, float addrspace(4)*, i64, [2 x i64], [2 x i64] }">
// CHECK: llvm.mlir.constant(1 : index) : !llvm.i64
// CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[4, 1] : !llvm<"{ float addrspace(4)*, float addrspace(4)*, i64, [2 x i64], [2 x i64] }">
// CHECK: llvm.mlir.constant(64 : index) : !llvm.i64
// CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[3, 0] : !llvm<"{ float addrspace(4)*, float addrspace(4)*, i64, [2 x i64], [2 x i64] }">
// CHECK: llvm.mlir.constant(4 : index) : !llvm.i64
// CHECK: llvm.insertvalue %{{.*}}, %{{.*}}[4, 0] : !llvm<"{ float addrspace(4)*, float addrspace(4)*, i64, [2 x i64], [2 x i64] }">
%7 = view %6[%arg2][] : memref<2048xi8, 4> to memref<64x4xf32, 4>
return return
} }
// CHECK-LABEL: func @subview( // CHECK-LABEL: func @subview(
// CHECK-COUNT-2: !llvm<"float*">, // CHECK-COUNT-2: !llvm<"float*">,
// CHECK-COUNT-5: {{%[a-zA-Z0-9]*}}: !llvm.i64, // CHECK-COUNT-5: {{%[a-zA-Z0-9]*}}: !llvm.i64,
// CHECK: %[[ARG0:[a-zA-Z0-9]*]]: !llvm.i64, // CHECK: %[[ARG0:[a-zA-Z0-9]*]]: !llvm.i64,
// CHECK: %[[ARG1:[a-zA-Z0-9]*]]: !llvm.i64, // CHECK: %[[ARG1:[a-zA-Z0-9]*]]: !llvm.i64,
▲ Show 20 Lines • Show All 445 Lines • Show Last 20 Lines