Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions mlir/lib/Dialect/Linalg/Transforms/RuntimeOpVerification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "mlir/Dialect/Index/IR/IndexOps.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/MemRef/IR/MemRef.h"
#include "mlir/Dialect/SCF/IR/SCF.h"
#include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/Interfaces/RuntimeVerifiableOpInterface.h"

Expand All @@ -43,6 +44,32 @@ struct StructuredOpInterface
auto zero = arith::ConstantIndexOp::create(builder, loc, 0);
auto one = arith::ConstantIndexOp::create(builder, loc, 1);

Value iterationDomainIsNonDegenerate;
for (auto [start, end] : llvm::zip(starts, ends)) {
auto startValue = getValueOrCreateConstantIndexOp(builder, loc, start);
auto endValue = getValueOrCreateConstantIndexOp(builder, loc, end);

// Loop Trip count > 0 iff start < end
Value dimensionHasNonZeroTripCount = builder.create<index::CmpOp>(
loc, index::IndexCmpPredicate::SLT, startValue, endValue);

if (!iterationDomainIsNonDegenerate) {
iterationDomainIsNonDegenerate = dimensionHasNonZeroTripCount;
} else {
// Iteration domain is non-degenerate iff all dimensions have loop trip
// count > 0
iterationDomainIsNonDegenerate = builder.create<arith::AndIOp>(
loc, iterationDomainIsNonDegenerate, dimensionHasNonZeroTripCount);
}
}

if (!iterationDomainIsNonDegenerate)
return;

auto ifOp = builder.create<scf::IfOp>(loc, iterationDomainIsNonDegenerate,
/*withElseRegion=*/false);
builder.setInsertionPointToStart(&ifOp.getThenRegion().front());

// Subtract one from the loop ends before composing with the indexing map
transform(ends, ends.begin(), [&](OpFoldResult end) {
auto endValue = getValueOrCreateConstantIndexOp(builder, loc, end);
Expand Down Expand Up @@ -110,6 +137,7 @@ struct StructuredOpInterface
builder.createOrFold<cf::AssertOp>(loc, cmpOp, msg);
}
}
builder.setInsertionPointAfter(ifOp);
}
};

Expand Down
23 changes: 23 additions & 0 deletions mlir/test/Integration/Dialect/Linalg/CPU/runtime-verification.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,17 @@ func.func @main() {
// CHECK: unexpected negative result on dimension #0 of input/output operand #0
func.call @reverse_from_3(%d5x) : (tensor<?xf32>) -> (tensor<?xf32>)

%c0x = arith.constant dense<1.0> : tensor<0xf32>
%d0x = tensor.cast %c0x : tensor<0xf32> to tensor<?xf32>
// CHECK-NOT: ERROR: Runtime op verification failed
func.call @fill_empty_1d(%d0x) : (tensor<?xf32>) -> (tensor<?xf32>)

%c0x5 = arith.constant dense<0.0> : tensor<0x5xf32>
%d0x5 = tensor.cast %c0x5 : tensor<0x5xf32> to tensor<?x?xf32>

// CHECK-NOT: ERROR: Runtime op verification failed
func.call @fill_empty_2d(%d0x5) : (tensor<?x?xf32>) -> (tensor<?x?xf32>)

return
}

Expand Down Expand Up @@ -297,3 +308,15 @@ func.func @reverse_from_3(%arg0: tensor<?xf32>) -> (tensor<?xf32>) {
} -> tensor<?xf32>
return %result : tensor<?xf32>
}

func.func @fill_empty_1d(%arg0: tensor<?xf32>) -> (tensor<?xf32>) {
%c0 = arith.constant 0.0 : f32
%0 = linalg.fill ins(%c0 : f32) outs(%arg0 : tensor<?xf32>) -> tensor<?xf32>
return %0 : tensor<?xf32>
}

func.func @fill_empty_2d(%arg0: tensor<?x?xf32>) -> (tensor<?x?xf32>) {
%c0 = arith.constant 0.0 : f32
%0 = linalg.fill ins(%c0 : f32) outs(%arg0 : tensor<?x?xf32>) -> tensor<?x?xf32>
return %0 : tensor<?x?xf32>
}