This is an archive of the discontinued LLVM Phabricator instance.

Differential D82380

Add test with memory access operands.
AbandonedPublic

Authored by ergawy on Jun 23 2020, 7:17 AM.

Details

Reviewers
mravishankar
antiagainst

Diff Detail

Event Timeline

ergawy created this revision.Jun 23 2020, 7:17 AM
Herald added a reviewer: mravishankar. · View Herald TranscriptJun 23 2020, 7:17 AM
Herald added a reviewer: antiagainst. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: AlexeySotkin, msifontes, jurahul and 16 others. · View Herald Transcript
ergawy added a comment.EditedJun 23 2020, 7:19 AM

Comitted by mistake, abandoned.

ergawy abandoned this revision.Jun 23 2020, 7:20 AM
Harbormaster failed remote builds in B61394: Diff 272714!Jun 23 2020, 7:27 AM

Revision Contents

PathSize
mlir/
include/
mlir/
Dialect/
SPIRV/
6 lines
test/
Dialect/
SPIRV/
Serialization/
21 lines

Diff 272714

mlir/include/mlir/Dialect/SPIRV/SPIRVOps.td

Show First 20 Lines • Show All 199 Lines • ▼ Show 20 Lines copy-memory-op ::= `spv.CopyMemory ` storage-class ssa-use
storage-class ssa-use storage-class ssa-use
(`[` memory-access `]`)? (`[` memory-access `]`)?
` : ` spirv-element-type ` : ` spirv-element-type
``` ```
#### Example: #### Example:
```mlir ```mlir
[TODO] %0 = spv.Variable : !spv.ptr<f32, Function>
%1 = spv.Variable : !spv.ptr<f32, Function>
spv.CopyMemory "Function" %0, "Function" %1 : f32
``` ```
}]; }];
let arguments = (ins let arguments = (ins
SPV_AnyPtr:$target, SPV_AnyPtr:$target,
SPV_AnyPtr:$source, SPV_AnyPtr:$source,
OptionalAttr<SPV_MemoryAccessAttr>:$memory_access, OptionalAttr<SPV_MemoryAccessAttr>:$memory_access,
OptionalAttr<I32Attr>:$alignment OptionalAttr<I32Attr>:$alignment
); );
let results = (outs); let results = (outs);
let verifier = [{ /* TODO */ return success(); }]; let verifier = [{ return success(); }];
} }
// ----- // -----
def SPV_ExecutionModeOp : SPV_Op<"ExecutionMode", [InModuleScope]> { def SPV_ExecutionModeOp : SPV_Op<"ExecutionMode", [InModuleScope]> {
let summary = "Declare an execution mode for an entry point."; let summary = "Declare an execution mode for an entry point.";
let description = [{ let description = [{
▲ Show 20 Lines • Show All 305 Lines • Show Last 20 Lines

mlir/test/Dialect/SPIRV/Serialization/memory-ops.mlir

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Lines spv.func @load_store_zero_rank_int(%arg0: !spv.ptr<!spv.struct<!spv.array<1 x i32, stride=4> [0]>, StorageBuffer>, %arg1: !spv.ptr<!spv.struct<!spv.array<1 x i32, stride=4> [0]>, StorageBuffer>) "None" {
spv.Store "StorageBuffer" %4, %2 : i32 spv.Store "StorageBuffer" %4, %2 : i32
spv.Return spv.Return
} }
} }
// ----- // -----
spv.module Logical GLSL450 requires #spv.vce<v1.0, [Shader], []> { spv.module Logical GLSL450 requires #spv.vce<v1.0, [Shader], []> {
spv.func @simple_copy_memory() "None" { spv.func @copy_memory_simple() "None" {
%0 = spv.Variable : !spv.ptr<f32, Function> %0 = spv.Variable : !spv.ptr<f32, Function>
%1 = spv.Variable : !spv.ptr<f32, Function> %1 = spv.Variable : !spv.ptr<f32, Function>
// CHECK: spv.CopyMemory "Function" %{{.*}}, "Function" %{{.*}} : f32 // CHECK: spv.CopyMemory "Function" %{{.*}}, "Function" %{{.*}} : f32
spv.CopyMemory "Function" %0, "Function" %1 : f32 spv.CopyMemory "Function" %0, "Function" %1 : f32
spv.Return spv.Return
} }
} }
// ----- // -----
spv.module Logical GLSL450 requires #spv.vce<v1.0, [Shader], []> { spv.module Logical GLSL450 requires #spv.vce<v1.0, [Shader], []> {
spv.func @copy_memory_different_storage_classes(%in : !spv.ptr<!spv.array<4xf32>, Input>, %out : !spv.ptr<!spv.array<4xf32>, Output>) "None" { spv.func @copy_memory_different_storage_classes(%in : !spv.ptr<!spv.array<4xf32>, Input>, %out : !spv.ptr<!spv.array<4xf32>, Output>) "None" {
// CHECK: spv.CopyMemory "Output" %{{.*}}, "Input" %{{.*}} : !spv.array<4 x f32> // CHECK: spv.CopyMemory "Output" %{{.*}}, "Input" %{{.*}} : !spv.array<4 x f32>
spv.CopyMemory "Output" %out, "Input" %in : !spv.array<4xf32> spv.CopyMemory "Output" %out, "Input" %in : !spv.array<4xf32>
spv.Return spv.Return
} }
} }
// -----
spv.module Logical GLSL450 requires #spv.vce<v1.0, [Shader], []> {
spv.func @copy_memory_with_access_operands() "None" {
%0 = spv.Variable : !spv.ptr<f32, Function>
%1 = spv.Variable : !spv.ptr<f32, Function>
// CHECK: spv.CopyMemory "Function" %{{.*}}, "Function" %{{.*}} ["Aligned", 4] : f32
spv.CopyMemory "Function" %0, "Function" %1 ["Aligned", 4] : f32
%2 = spv.Variable : !spv.ptr<f32, Function>
%3 = spv.Variable : !spv.ptr<f32, Function>
// CHECK: spv.CopyMemory "Function" %{{.*}}, "Function" %{{.*}} ["Volatile"] : f32
spv.CopyMemory "Function" %2, "Function" %3 ["Volatile"] : f32
spv.Return
}
}