belonging to a structured control flow construct. It is also more idiomatic to
MLIR system.
-We introduce a `spv.selection` and `spv.mlir.loop` op for structured selections and
+We introduce a `spv.mlir.selection` and `spv.mlir.loop` op for structured selections and
loops, respectively. The merge targets are the next ops following them. Inside
their regions, a special terminator, `spv.mlir.merge` is introduced for branching to
the merge target.
### Selection
-`spv.selection` defines a selection construct. It contains one region. The
+`spv.mlir.selection` defines a selection construct. It contains one region. The
region should contain at least two blocks: one selection header block and one
merge block.
%two = spv.Constant 2: i32
%x = spv.Variable init(%zero) : !spv.ptr<i32, Function>
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^else
^then:
func @foo() -> () {
%var = spv.Variable : !spv.ptr<i32, Function>
- spv.selection {
+ spv.mlir.selection {
%true = spv.Constant true
spv.BranchConditional %true, ^true, ^false
* Attributes on ops, if not part of the op's binary encoding, are emitted as
`OpDecorate*` instructions in the SPIR-V binary module section for
decorations.
-* `spv.selection`s and `spv.mlir.loop`s are emitted as basic blocks with `Op*Merge`
+* `spv.mlir.selection`s and `spv.mlir.loop`s are emitted as basic blocks with `Op*Merge`
instructions in the header block as required by the binary format.
* Block arguments are materialized as `OpPhi` instructions at the beginning of
the corresponding blocks.
`spv.mlir.referenceof` op to turn the symbol of the corresponding
`spv.SpecConstant` into an SSA value.
* `OpPhi` instructions are converted to block arguments.
-* Structured control flow are placed inside `spv.selection` and `spv.mlir.loop`.
+* Structured control flow are placed inside `spv.mlir.selection` and `spv.mlir.loop`.
## Conversions
spv.FunctionCall @bar(%0) : (i32) -> () => llvm.call @bar(%0) : (f32) -> ()
```
-### `spv.selection` and `spv.mlir.loop`
+### `spv.mlir.selection` and `spv.mlir.loop`
-Control flow within `spv.selection` and `spv.mlir.loop` is lowered directly to LLVM
+Control flow within `spv.mlir.selection` and `spv.mlir.loop` is lowered directly to LLVM
via branch ops. The conversion can only be applied to selection or loop with all
blocks being reachable. Moreover, selection and loop control attributes (such as
`Flatten` or `Unroll`) are not supported at the moment.
```mlir
// Conversion of selection
%cond = spv.Constant true %cond = llvm.mlir.constant(true) : i1
-spv.selection {
+spv.mlir.selection {
spv.BranchConditional %cond, ^true, ^false llvm.cond_br %cond, ^true, ^false
^true: ^true:
let summary = "A special terminator for merging a structured selection/loop.";
let description = [{
- We use `spv.selection`/`spv.mlir.loop` for modelling structured selection/loop.
+ We use `spv.mlir.selection`/`spv.mlir.loop` for modelling structured selection/loop.
This op is a terminator used inside their regions to mean jumping to the
- merge point, which is the next op following the `spv.selection` or
+ merge point, which is the next op following the `spv.mlir.selection` or
`spv.mlir.loop` op. This op does not have a corresponding instruction in the
SPIR-V binary format; it's solely for structural purpose.
}];
let assemblyFormat = "$value attr-dict `:` type($value)";
}
-def SPV_SelectionOp : SPV_Op<"selection", [InFunctionScope]> {
+def SPV_SelectionOp : SPV_Op<"mlir.selection", [InFunctionScope]> {
let summary = "Define a structured selection.";
let description = [{
Instead of having a `spv.SelectionMerge` op to directly model selection
merge instruction for indicating the merge target, we use regions to delimit
the boundary of the selection: the merge target is the next op following the
- `spv.selection` op. This way it's easier to discover all blocks belonging to
+ `spv.mlir.selection` op. This way it's easier to discover all blocks belonging to
the selection and it plays nicer with the MLIR system.
- The `spv.selection` region should contain at least two blocks: one selection
+ The `spv.mlir.selection` region should contain at least two blocks: one selection
header block, and one selection merge. The selection header block should be
the first block. The selection merge block should be the last block.
The merge block should only contain a `spv.mlir.merge` op.
/// Adds a selection merge block containing one spv.mlir.merge op.
void addMergeBlock();
- /// Creates a spv.selection op for `if (<condition>) then { <thenBody> }`
+ /// Creates a spv.mlir.selection op for `if (<condition>) then { <thenBody> }`
/// with `builder`. `builder`'s insertion point will remain at after the
- /// newly inserted spv.selection op afterwards.
+ /// newly inserted spv.mlir.selection op afterwards.
static SelectionOp createIfThen(
Location loc, Value condition,
function_ref<void(OpBuilder &builder)> thenBody,
namespace mlir {
struct ScfToSPIRVContextImpl {
// Map between the spirv region control flow operation (spv.mlir.loop or
- // spv.selection) to the VariableOp created to store the region results. The
- // order of the VariableOp matches the order of the results.
+ // spv.mlir.selection) to the VariableOp created to store the region results.
+ // The order of the VariableOp matches the order of the results.
DenseMap<Operation *, SmallVector<spirv::VariableOp, 8>> outputVars;
};
} // namespace mlir
/// Helper function to replaces SCF op outputs with SPIR-V variable loads.
/// We create VariableOp to handle the results value of the control flow region.
-/// spv.mlir.loop/spv.selection currently don't yield value. Right after the
-/// loop we load the value from the allocation and use it as the SCF op result.
+/// spv.mlir.loop/spv.mlir.selection currently don't yield value. Right after
+/// the loop we load the value from the allocation and use it as the SCF op
+/// result.
template <typename ScfOp, typename OpTy>
static void replaceSCFOutputValue(ScfOp scfOp, OpTy newOp,
ConversionPatternRewriter &rewriter,
scf::IfOpAdaptor ifOperands(operands);
auto loc = ifOp.getLoc();
- // Create `spv.selection` operation, selection header block and merge block.
+ // Create `spv.mlir.selection` operation, selection header block and merge
+ // block.
auto selectionControl = rewriter.getI32IntegerAttr(
static_cast<uint32_t>(spirv::SelectionControl::None));
auto selectionOp = rewriter.create<spirv::SelectionOp>(loc, selectionControl);
}
};
-/// Converts `spv.selection` with `spv.BranchConditional` in its header block.
-/// All blocks within selection should be reachable for conversion to succeed.
+/// Converts `spv.mlir.selection` with `spv.BranchConditional` in its header
+/// block. All blocks within selection should be reachable for conversion to
+/// succeed.
class SelectionPattern : public SPIRVToLLVMConversion<spirv::SelectionOp> {
public:
using SPIRVToLLVMConversion<spirv::SelectionOp>::SPIRVToLLVMConversion;
if (op.selection_control() != spirv::SelectionControl::None)
return failure();
- // `spv.selection` should have at least two blocks: one selection header
- // block and one merge block. If no blocks are present, or control flow
- // branches straight to merge block (two blocks are present), the op is
+ // `spv.mlir.selection` should have at least two blocks: one selection
+ // header block and one merge block. If no blocks are present, or control
+ // flow branches straight to merge block (two blocks are present), the op is
// redundant and it is erased.
if (op.body().getBlocks().size() <= 2) {
rewriter.eraseOp(op);
Location loc = op.getLoc();
- // Split the current block after `spv.selection`. The remaining ops will be
- // used in `continueBlock`.
+ // Split the current block after `spv.mlir.selection`. The remaining ops
+ // will be used in `continueBlock`.
auto *currentBlock = rewriter.getInsertionBlock();
rewriter.setInsertionPointAfter(op);
auto position = rewriter.getInsertionPoint();
}
//===----------------------------------------------------------------------===//
-// spv.selection
+// spv.mlir.selection
//===----------------------------------------------------------------------===//
namespace {
-// Blocks from the given `spv.selection` operation must satisfy the following
-// layout:
+// Blocks from the given `spv.mlir.selection` operation must satisfy the
+// following layout:
//
// +-----------------------------------------------+
// | header block |
PatternRewriter &rewriter) const override {
auto *op = selectionOp.getOperation();
auto &body = op->getRegion(0);
- // Verifier allows an empty region for `spv.selection`.
+ // Verifier allows an empty region for `spv.mlir.selection`.
if (body.empty()) {
return failure();
}
rewriter.create<spirv::StoreOp>(selectOp.getLoc(), ptrValue,
selectOp.getResult(), storeOpAttributes);
- // `spv.selection` is not needed anymore.
+ // `spv.mlir.selection` is not needed anymore.
rewriter.eraseOp(op);
return success();
}
/// 'dest' that is attached to an operation registered to the current dialect.
bool isLegalToInline(Region *dest, Region *src, bool wouldBeCloned,
BlockAndValueMapping &) const final {
- // Return true here when inlining into spv.func, spv.selection, and
+ // Return true here when inlining into spv.func, spv.mlir.selection, and
// spv.mlir.loop operations.
auto *op = dest->getParentOp();
return isa<spirv::FuncOp, spirv::SelectionOp, spirv::LoopOp>(op);
auto *parentOp = mergeOp->getParentOp();
if (!parentOp || !isa<spirv::SelectionOp, spirv::LoopOp>(parentOp))
return mergeOp.emitOpError(
- "expected parent op to be 'spv.selection' or 'spv.mlir.loop'");
+ "expected parent op to be 'spv.mlir.selection' or 'spv.mlir.loop'");
Block &parentLastBlock = mergeOp->getParentRegion()->back();
if (mergeOp.getOperation() != parentLastBlock.getTerminator())
return mergeOp.emitOpError("can only be used in the last block of "
- "'spv.selection' or 'spv.mlir.loop'");
+ "'spv.mlir.selection' or 'spv.mlir.loop'");
return success();
}
}
//===----------------------------------------------------------------------===//
-// spv.selection
+// spv.mlir.selection
//===----------------------------------------------------------------------===//
static ParseResult parseSelectionOp(OpAsmParser &parser,
}
// Wire up block arguments from OpPhi instructions.
- // Put all structured control flow in spv.selection/spv.mlir.loop ops.
+ // Put all structured control flow in spv.mlir.selection/spv.mlir.loop ops.
if (failed(wireUpBlockArgument()) || failed(structurizeControlFlow())) {
return failure();
}
return block;
}
- // We don't know where this block will be placed finally (in a spv.selection
- // or spv.mlir.loop or function). Create it into the function for now and sort
- // out the proper place later.
+ // We don't know where this block will be placed finally (in a
+ // spv.mlir.selection or spv.mlir.loop or function). Create it into the
+ // function for now and sort out the proper place later.
auto *block = curFunction->addBlock();
LLVM_DEBUG(llvm::dbgs() << "[block] created block for id = " << id << " @ "
<< block << "\n");
namespace {
/// A class for putting all blocks in a structured selection/loop in a
-/// spv.selection/spv.mlir.loop op.
+/// spv.mlir.selection/spv.mlir.loop op.
class ControlFlowStructurizer {
public:
/// Structurizes the loop at the given `headerBlock`.
: location(loc), control(control), blockMergeInfo(mergeInfo),
headerBlock(header), mergeBlock(merge), continueBlock(cont) {}
- /// Creates a new spv.selection op at the beginning of the `mergeBlock`.
+ /// Creates a new spv.mlir.selection op at the beginning of the `mergeBlock`.
spirv::SelectionOp createSelectionOp(uint32_t selectionControl);
/// Creates a new spv.mlir.loop op at the beginning of the `mergeBlock`.
Block *headerBlock;
Block *mergeBlock;
- Block *continueBlock; // nullptr for spv.selection
+ Block *continueBlock; // nullptr for spv.mlir.selection
llvm::SetVector<Block *> constructBlocks;
};
/// A struct for containing a header block's merge and continue targets.
///
/// This struct is used to track original structured control flow info from
-/// SPIR-V blob. This info will be used to create spv.selection/spv.mlir.loop
-/// later.
+/// SPIR-V blob. This info will be used to create
+/// spv.mlir.selection/spv.mlir.loop later.
struct BlockMergeInfo {
Block *mergeBlock;
- Block *continueBlock; // nullptr for spv.selection
+ Block *continueBlock; // nullptr for spv.mlir.selection
Location loc;
uint32_t control;
// In SPIR-V, structured control flow is explicitly declared using merge
// instructions (OpSelectionMerge and OpLoopMerge). In the SPIR-V dialect,
- // we use spv.selection and spv.mlir.loop to group structured control flow.
- // The deserializer need to turn structured control flow marked with merge
- // instructions into using spv.selection/spv.mlir.loop ops.
+ // we use spv.mlir.selection and spv.mlir.loop to group structured control
+ // flow. The deserializer need to turn structured control flow marked with
+ // merge instructions into using spv.mlir.selection/spv.mlir.loop ops.
//
// Because structured control flow can nest and the basic block order have
// flexibility, we cannot isolate a structured selection/loop without
// target blocks.
// 2. For each selection/loop header block, recursively get all basic blocks
// reachable (except the merge block) and put them in a newly created
- // spv.selection/spv.mlir.loop's region. Structured control flow guarantees
- // that we enter and exit in structured ways and the construct is nestable.
- // 3. Put the new spv.selection/spv.mlir.loop op at the beginning of the old
- // merge
+ // spv.mlir.selection/spv.mlir.loop's region. Structured control flow
+ // guarantees that we enter and exit in structured ways and the construct
+ // is nestable.
+ // 3. Put the new spv.mlir.selection/spv.mlir.loop op at the beginning of the
+ // old merge
// block and redirect all branches to the old header block to the old
- // merge block (which contains the spv.selection/spv.mlir.loop op now).
+ // merge block (which contains the spv.mlir.selection/spv.mlir.loop op
+ // now).
/// For OpPhi instructions, we use block arguments to represent them. OpPhi
/// encodes a list of (value, predecessor) pairs. At the time of handling the
LogicalResult wireUpBlockArgument();
/// Extracts blocks belonging to a structured selection/loop into a
- /// spv.selection/spv.mlir.loop op. This method iterates until all blocks
+ /// spv.mlir.selection/spv.mlir.loop op. This method iterates until all blocks
/// declared as selection/loop headers are handled.
LogicalResult structurizeControlFlow();
// For structured selection, we cannot have blocks in the selection construct
// branching to the selection header block. Entering the selection (and
// reaching the selection header) must be from the block containing the
- // spv.selection op. If there are ops ahead of the spv.selection op in the
- // block, we can "merge" them into the selection header. So here we don't need
- // to emit a separate block; just continue with the existing block.
+ // spv.mlir.selection op. If there are ops ahead of the spv.mlir.selection op
+ // in the block, we can "merge" them into the selection header. So here we
+ // don't need to emit a separate block; just continue with the existing block.
if (failed(processBlock(headerBlock, /*omitLabel=*/true, emitSelectionMerge)))
return failure();
// structure. It does not directly map to the incoming parent block for the
// OpPhi instructions at SPIR-V binary level. This is because structured
// control flow ops are serialized to multiple SPIR-V blocks. If there is a
- // spv.selection/spv.mlir.loop op in the MLIR predecessor block, the branch
- // op jumping to the OpPhi's block then resides in the previous structured
- // control flow op's merge block.
+ // spv.mlir.selection/spv.mlir.loop op in the MLIR predecessor block, the
+ // branch op jumping to the OpPhi's block then resides in the previous
+ // structured control flow op's merge block.
predecessor = getPhiIncomingBlock(predecessor);
if (auto branchOp = dyn_cast<spirv::BranchOp>(terminator)) {
predecessors.emplace_back(predecessor, branchOp.operand_begin());
// CHECK: %[[OUTPTR:.+]] = spv.AccessChain %[[OUTPUT]][%[[ZERO]], %[[ZERO]]]
// CHECK: %[[ELECT:.+]] = spv.GroupNonUniformElect Subgroup : i1
-// CHECK: spv.selection {
+// CHECK: spv.mlir.selection {
// CHECK: spv.BranchConditional %[[ELECT]], ^bb1, ^bb2
// CHECK: ^bb1:
// CHECK: spv.AtomicIAdd "Device" "AcquireRelease" %[[OUTPTR]], %[[ADD]]
%value = constant 0.0 : f32
%i = constant 0 : index
- // CHECK: spv.selection {
+ // CHECK: spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional {{%.*}}, [[TRUE:\^.*]], [[MERGE:\^.*]]
// CHECK-NEXT: [[TRUE]]:
// CHECK: spv.Branch [[MERGE]]
%i = constant 0 : index
%j = constant 9 : index
- // CHECK: spv.selection {
+ // CHECK: spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional {{%.*}}, [[TRUE_TOP:\^.*]], [[FALSE_TOP:\^.*]]
// CHECK-NEXT: [[TRUE_TOP]]:
- // CHECK-NEXT: spv.selection {
+ // CHECK-NEXT: spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional {{%.*}}, [[TRUE_NESTED_TRUE_PATH:\^.*]], [[FALSE_NESTED_TRUE_PATH:\^.*]]
// CHECK-NEXT: [[TRUE_NESTED_TRUE_PATH]]:
// CHECK: spv.Branch [[MERGE_NESTED_TRUE_PATH:\^.*]]
// CHECK-NEXT: }
// CHECK-NEXT: spv.Branch [[MERGE_TOP:\^.*]]
// CHECK-NEXT: [[FALSE_TOP]]:
- // CHECK-NEXT: spv.selection {
+ // CHECK-NEXT: spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional {{%.*}}, [[TRUE_NESTED_FALSE_PATH:\^.*]], [[FALSE_NESTED_FALSE_PATH:\^.*]]
// CHECK-NEXT: [[TRUE_NESTED_FALSE_PATH]]:
// CHECK: spv.Branch [[MERGE_NESTED_FALSE_PATH:\^.*]]
func @simple_if_yield(%arg2 : memref<10xf32>, %arg3 : i1) {
// CHECK: %[[VAR1:.*]] = spv.Variable : !spv.ptr<f32, Function>
// CHECK: %[[VAR2:.*]] = spv.Variable : !spv.ptr<f32, Function>
- // CHECK: spv.selection {
+ // CHECK: spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional {{%.*}}, [[TRUE:\^.*]], [[FALSE:\^.*]]
// CHECK-NEXT: [[TRUE]]:
// CHECK: %[[RET1TRUE:.*]] = spv.Constant 0.000000e+00 : f32
func @simple_if_yield_type_change(%arg2 : memref<10xf32>, %arg3 : memref<10xf32>, %arg4 : i1) {
// CHECK-LABEL: @simple_if_yield_type_change
// CHECK: %[[VAR:.*]] = spv.Variable : !spv.ptr<!spv.ptr<!spv.struct<(!spv.array<10 x f32, stride=4> [0])>, StorageBuffer>, Function>
- // CHECK: spv.selection {
+ // CHECK: spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional {{%.*}}, [[TRUE:\^.*]], [[FALSE:\^.*]]
// CHECK-NEXT: [[TRUE]]:
// CHECK: spv.Store "Function" %[[VAR]], {{%.*}} : !spv.ptr<!spv.struct<(!spv.array<10 x f32, stride=4> [0])>, StorageBuffer>
// -----
//===----------------------------------------------------------------------===//
-// spv.selection
+// spv.mlir.selection
//===----------------------------------------------------------------------===//
spv.module Logical GLSL450 {
spv.func @selection_empty() -> () "None" {
// CHECK: llvm.return
- spv.selection {
+ spv.mlir.selection {
}
spv.Return
}
spv.func @selection_with_merge_block_only() -> () "None" {
%cond = spv.Constant true
// CHECK: llvm.return
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^merge, ^merge
^merge:
spv.mlir.merge
// CHECK: %[[COND:.*]] = llvm.mlir.constant(true) : i1
%cond = spv.Constant true
// CHECK: llvm.cond_br %[[COND]], ^bb1, ^bb2
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^true, ^merge
// CHECK: ^bb1:
^true:
// CHECK: %[[COND:.*]] = llvm.mlir.constant(true) : i1
%cond = spv.Constant true
// CHECK: llvm.cond_br %[[COND]], ^bb1, ^bb2
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^true, ^false
// CHECK: ^bb1:
^true:
// CHECK: %[[ZERO:.*]] = llvm.mlir.constant(0 : i32) : i32
%0 = spv.Constant 0 : i32
// CHECK: llvm.cond_br %{{.*}}, ^bb1(%[[ZERO]] : i32), ^bb2
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %arg0, ^true(%0 : i32), ^merge
// CHECK: ^bb1(%[[ARG:.*]]: i32):
^true(%arg1: i32):
//===----------------------------------------------------------------------===//
func @merge() -> () {
- // expected-error @+1 {{expected parent op to be 'spv.selection' or 'spv.mlir.loop'}}
+ // expected-error @+1 {{expected parent op to be 'spv.mlir.selection' or 'spv.mlir.loop'}}
spv.mlir.merge
}
%one = spv.Constant 1: i32
%var = spv.Variable init(%zero) : !spv.ptr<i32, Function>
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^merge
^then:
spv.Store "Function" %var, %one : i32
- // expected-error @+1 {{can only be used in the last block of 'spv.selection' or 'spv.mlir.loop'}}
+ // expected-error @+1 {{can only be used in the last block of 'spv.mlir.selection' or 'spv.mlir.loop'}}
spv.mlir.merge
^merge:
^header:
spv.BranchConditional %true, ^body, ^merge
^body:
- // expected-error @+1 {{can only be used in the last block of 'spv.selection' or 'spv.mlir.loop'}}
+ // expected-error @+1 {{can only be used in the last block of 'spv.mlir.selection' or 'spv.mlir.loop'}}
spv.mlir.merge
^continue:
spv.Branch ^header
// CHECK-LABEL: func @in_selection
func @in_selection(%cond : i1) -> () {
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^merge
^then:
// CHECK: spv.Return
spv.module Logical GLSL450 {
spv.func @in_nested_region(%cond: i1) -> (i32) "None" {
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^merge
^then:
// expected-error @+1 {{cannot be used in functions returning value}}
// CHECK-LABEL: func @in_selection
func @in_selection(%cond : i1) -> (i32) {
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^merge
^then:
%zero = spv.Constant 0 : i32
spv.module Logical GLSL450 {
spv.func @in_nested_region(%cond: i1) -> () "None" {
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^merge
^then:
%cst = spv.Constant 0: i32
// -----
//===----------------------------------------------------------------------===//
-// spv.selection
+// spv.mlir.selection
//===----------------------------------------------------------------------===//
func @selection(%cond: i1) -> () {
%one = spv.Constant 1: i32
%var = spv.Variable init(%zero) : !spv.ptr<i32, Function>
- // CHECK: spv.selection {
- spv.selection {
+ // CHECK: spv.mlir.selection {
+ spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional %{{.*}}, ^bb1, ^bb2
spv.BranchConditional %cond, ^then, ^merge
%two = spv.Constant 2: i32
%var = spv.Variable init(%zero) : !spv.ptr<i32, Function>
- // CHECK: spv.selection {
- spv.selection {
+ // CHECK: spv.mlir.selection {
+ spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional %{{.*}}, ^bb1, ^bb2
spv.BranchConditional %cond, ^then, ^else
// CHECK-LABEL: @empty_region
func @empty_region() -> () {
- // CHECK: spv.selection
- spv.selection {
+ // CHECK: spv.mlir.selection
+ spv.mlir.selection {
}
return
}
// CHECK-LABEL: @selection_with_control
func @selection_with_control() -> () {
- // CHECK: spv.selection control(Flatten)
- spv.selection control(Flatten) {
+ // CHECK: spv.mlir.selection control(Flatten)
+ spv.mlir.selection control(Flatten) {
}
return
}
func @wrong_merge_block() -> () {
// expected-error @+1 {{last block must be the merge block with only one 'spv.mlir.merge' op}}
- spv.selection {
+ spv.mlir.selection {
spv.Return
}
return
func @missing_entry_block() -> () {
// expected-error @+1 {{must have a selection header block}}
- spv.selection {
+ spv.mlir.selection {
spv.mlir.merge
}
return
// -----
//===----------------------------------------------------------------------===//
-// spv.selection
+// spv.mlir.selection
//===----------------------------------------------------------------------===//
func @canonicalize_selection_op_scalar_type(%cond: i1) -> () {
// CHECK: %[[SRC_VALUE:.*]] = spv.Select {{%.*}}, %[[TRUE_VALUE]], %[[FALSE_VALUE]] : i1, i32
// CHECK-NEXT: spv.Store "Function" %[[DST_VAR]], %[[SRC_VALUE]] ["Aligned", 4] : i32
// CHECK-NEXT: spv.Return
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^else
^else:
// CHECK: %[[SRC_VALUE:.*]] = spv.Select {{%.*}}, %[[TRUE_VALUE]], %[[FALSE_VALUE]] : i1, vector<3xi32>
// CHECK-NEXT: spv.Store "Function" %[[DST_VAR]], %[[SRC_VALUE]] ["Aligned", 8] : vector<3xi32>
// CHECK-NEXT: spv.Return
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^else
^then:
// CHECK: %[[DST_VAR_1:.*]] = spv.Variable init({{%.*}}) : !spv.ptr<vector<3xi32>, Function>
%4 = spv.Variable init(%0) : !spv.ptr<vector<3xi32>, Function>
- // CHECK: spv.selection {
- spv.selection {
+ // CHECK: spv.mlir.selection {
+ spv.mlir.selection {
// CHECK: spv.BranchConditional
// CHECK-SAME: ^bb1(%[[DST_VAR_0]], %[[SRC_VALUE_0]]
// CHECK-SAME: ^bb1(%[[DST_VAR_1]], %[[SRC_VALUE_1]]
// CHECK: %[[DST_VAR_1:.*]] = spv.Variable init({{%.*}}) : !spv.ptr<vector<3xi32>, Function>
%4 = spv.Variable init(%0) : !spv.ptr<vector<3xi32>, Function>
- // CHECK: spv.selection {
- spv.selection {
+ // CHECK: spv.mlir.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^else
^then:
// CHECK: %[[DST_VAR:.*]] = spv.Variable init({{%.*}}) : !spv.ptr<vector<3xi32>, Function>
%3 = spv.Variable init(%0) : !spv.ptr<vector<3xi32>, Function>
- // CHECK: spv.selection {
- spv.selection {
+ // CHECK: spv.mlir.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^else
^then:
// CHECK: %[[DST_VAR:.*]] = spv.Variable init({{%.*}}) : !spv.ptr<vector<3xi32>, Function>
%3 = spv.Variable init(%0) : !spv.ptr<vector<3xi32>, Function>
- // CHECK: spv.selection {
- spv.selection {
+ // CHECK: spv.mlir.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^else
^then:
// CHECK: %[[DST_VAR:.*]] = spv.Variable init({{%.*}}) : !spv.ptr<vector<3xi32>, Function>
%3 = spv.Variable init(%0) : !spv.ptr<vector<3xi32>, Function>
- // CHECK: spv.selection {
- spv.selection {
+ // CHECK: spv.mlir.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^else
^then:
spv.module Logical GLSL450 {
spv.func @callee(%cond : i1) -> () "None" {
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^merge
^then:
spv.Return
spv.module Logical GLSL450 {
spv.func @callee(%cond : i1) -> () "None" {
- spv.selection {
+ spv.mlir.selection {
spv.BranchConditional %cond, ^then, ^merge
^then:
spv.Branch ^merge
spv.func @calling_selection_no_ret_func() "None" {
// CHECK-NEXT: %[[TRUE:.*]] = spv.Constant true
%0 = spv.Constant true
- // CHECK-NEXT: spv.selection
+ // CHECK-NEXT: spv.mlir.selection
// CHECK-NEXT: spv.BranchConditional %[[TRUE]], ^bb1, ^bb2
// CHECK-NEXT: ^bb1:
// CHECK-NEXT: spv.Branch ^bb2
%4 = spv.AccessChain %2[%1] : !spv.ptr<!spv.struct<(i32 [0])>, StorageBuffer>, i32
%5 = spv.Load "StorageBuffer" %4 : i32
%6 = spv.SGreaterThan %5, %1 : i32
- // CHECK: spv.selection
- spv.selection {
+ // CHECK: spv.mlir.selection
+ spv.mlir.selection {
spv.BranchConditional %6, ^bb1, ^bb2
^bb1: // pred: ^bb0
// CHECK: [[STOREPTR:%.*]] = spv.AccessChain [[ADDRESS_ARG1]]
%one = spv.Constant 1: i32
%two = spv.Constant 2: i32
%var = spv.Variable init(%zero) : !spv.ptr<i32, Function>
- spv.selection {
+ spv.mlir.selection {
// CHECK: loc({{".*debug.mlir"}}:128:5)
spv.BranchConditional %cond [5, 10], ^then, ^else
^then:
spv.func @foo() -> () "None" {
%var = spv.Variable : !spv.ptr<i32, Function>
-// CHECK: spv.selection
- spv.selection {
+// CHECK: spv.mlir.selection
+ spv.mlir.selection {
%true = spv.Constant true
// CHECK: spv.BranchConditional %{{.*}}, ^bb1, ^bb2
spv.BranchConditional %true, ^true, ^false
%two = spv.Constant 2: i32
%var = spv.Variable init(%zero) : !spv.ptr<i32, Function>
-// CHECK-NEXT: spv.selection control(Flatten)
+// CHECK-NEXT: spv.mlir.selection control(Flatten)
// CHECK-NEXT: spv.Constant 0
// CHECK-NEXT: spv.Variable
- spv.selection control(Flatten) {
+ spv.mlir.selection control(Flatten) {
// CHECK-NEXT: spv.BranchConditional %{{.*}} [5, 10], ^bb1, ^bb2
spv.BranchConditional %cond [5, 10], ^then, ^else
spv.func @selection(%cond: i1) -> (i32) "None" {
// CHECK: spv.Branch ^bb1
// CHECK-NEXT: ^bb1:
-// CHECK-NEXT: spv.selection
- spv.selection {
+// CHECK-NEXT: spv.mlir.selection
+ spv.mlir.selection {
// CHECK-NEXT: spv.BranchConditional %[[ARG]], ^bb1, ^bb2
spv.BranchConditional %cond, ^then, ^merge
projects / platform / upstream / llvm.git / commitdiff