diff options
| author | Mahesh Ravishankar <ravishankarm@google.com> | 2019-12-17 13:05:36 -0800 |
|---|---|---|
| committer | A. Unique TensorFlower <gardener@tensorflow.org> | 2019-12-17 13:06:05 -0800 |
| commit | 319cca3bbe69b20334caee2f93aaf6fe0318ca0d (patch) | |
| tree | 0f799d931e405c787ac5caa9c9c21b847ec0ed5d /mlir/test/Dialect | |
| parent | 42b3fe833502390d44d2df126048c8310dffa9bd (diff) | |
| download | bcm5719-llvm-319cca3bbe69b20334caee2f93aaf6fe0318ca0d.tar.gz bcm5719-llvm-319cca3bbe69b20334caee2f93aaf6fe0318ca0d.zip | |
Add missing virtual inliner interface method in SPIR-V dialect.
The inline interface uses two methods to check legality of inling:
1) Can a region be inlined into another.
2) Can an operation be inlined into another.
Setting the former to true, allows the inliner to use the second for
legality checks. Add this method to the SPIR-V dialect inlining
interface.
PiperOrigin-RevId: 286041734
Diffstat (limited to 'mlir/test/Dialect')
| -rw-r--r-- | mlir/test/Dialect/SPIRV/Transforms/inlining.mlir | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/mlir/test/Dialect/SPIRV/Transforms/inlining.mlir b/mlir/test/Dialect/SPIRV/Transforms/inlining.mlir index 9837d7babb7..75360194d7b 100644 --- a/mlir/test/Dialect/SPIRV/Transforms/inlining.mlir +++ b/mlir/test/Dialect/SPIRV/Transforms/inlining.mlir @@ -180,3 +180,48 @@ spv.module "Logical" "GLSL450" { spv.Return } } + +// ----- + +spv.module "Logical" "GLSL450" { + spv.globalVariable @arg_0 bind(0, 0) : !spv.ptr<!spv.struct<i32 [0]>, StorageBuffer> + spv.globalVariable @arg_1 bind(0, 1) : !spv.ptr<!spv.struct<i32 [0]>, StorageBuffer> + // CHECK: func @inline_into_selection_region + func @inline_into_selection_region() { + %1 = spv.constant 0 : i32 + // CHECK-DAG: [[ADDRESS_ARG0:%.*]] = spv._address_of @arg_0 + // CHECK-DAG: [[ADDRESS_ARG1:%.*]] = spv._address_of @arg_1 + // CHECK-DAG: [[LOADPTR:%.*]] = spv.AccessChain [[ADDRESS_ARG0]] + // CHECK: [[VAL:%.*]] = spv.Load "StorageBuffer" [[LOADPTR]] + %2 = spv._address_of @arg_0 : !spv.ptr<!spv.struct<i32 [0]>, StorageBuffer> + %3 = spv._address_of @arg_1 : !spv.ptr<!spv.struct<i32 [0]>, StorageBuffer> + %4 = spv.AccessChain %2[%1] : !spv.ptr<!spv.struct<i32 [0]>, StorageBuffer> + %5 = spv.Load "StorageBuffer" %4 : i32 + %6 = spv.SGreaterThan %5, %1 : i32 + // CHECK: spv.selection + spv.selection { + spv.BranchConditional %6, ^bb1, ^bb2 + ^bb1: // pred: ^bb0 + // CHECK: [[STOREPTR:%.*]] = spv.AccessChain [[ADDRESS_ARG1]] + %7 = spv.AccessChain %3[%1] : !spv.ptr<!spv.struct<i32 [0]>, StorageBuffer> + // CHECK-NOT: spv.FunctionCall + // CHECK: spv.AtomicIAdd "Device" "AcquireRelease" [[STOREPTR]], [[VAL]] + // CHECK: spv.Branch + spv.FunctionCall @atomic_add(%5, %7) : (i32, !spv.ptr<i32, StorageBuffer>) -> () + spv.Branch ^bb2 + ^bb2 : // 2 preds: ^bb0, ^bb1 + spv._merge + } + // CHECK: spv.Return + spv.Return + } + func @atomic_add(%arg0: i32, %arg1: !spv.ptr<i32, StorageBuffer>) { + %0 = spv.AtomicIAdd "Device" "AcquireRelease" %arg1, %arg0 : !spv.ptr<i32, StorageBuffer> + spv.Return + } + spv.EntryPoint "GLCompute" @inline_into_selection_region + spv.ExecutionMode @inline_into_selection_region "LocalSize", 32, 1, 1 +} attributes {capabilities = ["Shader"], extensions = ["SPV_KHR_storage_buffer_storage_class"]} + +// TODO: Add tests for inlining structured control flow into +// structured control flow.
\ No newline at end of file |
