Skip to content

Commit

Permalink
Remove explicit verifier usage as it is about to be obsolete (llvm#1195)
Browse files Browse the repository at this point in the history 
Several properties (such as verifier, printer & parser) are going to be obsolete in main mlir soon. This change removes the explicit usage of verifier and instead uses the hasVerifier option instead.

Also, some minor whitespace cleanup.

Signed-off-by: Stella Stamenova stilis@microsoft.com
  • Loading branch information
@sstamenova
sstamenova committed Feb 23, 2022
1 parent fa06812 commit 3a45ee5
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 126 deletions.
104 changes: 47 additions & 57 deletions src/Dialect/Krnl/Krnl.td
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

include "mlir/IR/OpBase.td"
include "mlir/Dialect/Shape/IR/ShapeBase.td"
include "mlir/Interfaces/CastInterfaces.td"
include "mlir/Interfaces/LoopLikeInterface.td"
include "mlir/Interfaces/SideEffectInterfaces.td"
include "mlir/Interfaces/ViewLikeInterface.td"
Expand All @@ -42,8 +43,8 @@ def KrnlDefineLoopsOp : Op<Krnl_Dialect, "define_loops"> {
intend to optimize.
}];

let arguments = (ins);
let results = (outs Variadic<AnyType>);

let skipDefaultBuilders = 1;
let builders = [ OpBuilder<(ins "int64_t":$num_loops)> ];

Expand All @@ -53,14 +54,14 @@ def KrnlDefineLoopsOp : Op<Krnl_Dialect, "define_loops"> {
let extraClassDeclaration = [{
static StringRef getNumLoopsAttrName() { return "num_loops"; }

// Helper function to extract the number of loops being defined.
int64_t getNumLoops() {
auto num_loops = (*this)->getAttrOfType<IntegerAttr>(getNumLoopsAttrName())
.getValue()
.getSExtValue();
return num_loops;
}
}];
// Helper function to extract the number of loops being defined.
int64_t getNumLoops() {
auto num_loops = (*this)->getAttrOfType<IntegerAttr>(getNumLoopsAttrName())
.getValue()
.getSExtValue();
return num_loops;
}
}];
}

def KrnlIterateOp : Op<Krnl_Dialect, "iterate", [ImplicitKrnlTerminator,
Expand Down Expand Up @@ -88,7 +89,9 @@ def KrnlIterateOp : Op<Krnl_Dialect, "iterate", [ImplicitKrnlTerminator,
}];

let arguments = (ins Variadic<AnyType>);

let regions = (region SizedRegion<1>:$bodyRegion);

let skipDefaultBuilders = 1;
let builders = [
// Main builder.
Expand All @@ -106,7 +109,12 @@ def KrnlIterateOp : Op<Krnl_Dialect, "iterate", [ImplicitKrnlTerminator,
CArg<"ArrayRef<IndexExpr>">:$lbs, CArg<"ArrayRef<IndexExpr>">:$ubs,
CArg<"ValueRange">:$iterArgs,
CArg<"function_ref<void(OpBuilder &, Location, ValueRange)>">:$bodyBuilderFn)>
];
];

let printer = [{ return ::print(p, *this); }];
let parser = [{ return ::parse$cppClass(parser, result); }];

let hasVerifier = 1;

let extraClassDeclaration = [{
// In krnl.iterate operation, operands are stored as such
Expand All @@ -127,11 +135,7 @@ def KrnlIterateOp : Op<Krnl_Dialect, "iterate", [ImplicitKrnlTerminator,

// Get name of the attribute for storing bound represented using affine maps.
static StringRef getBoundsAttrName() { return "bounds"; }
}];

let printer = [{ return ::print(p, *this); }];
let parser = [{ return ::parse$cppClass(parser, result); }];
let verifier = [{ return ::verify(*this); }];
}];
}

def KrnlTerminatorOp : Op<Krnl_Dialect, "terminate", [Terminator]> {
Expand All @@ -148,9 +152,6 @@ def KrnlTerminatorOp : Op<Krnl_Dialect, "terminate", [Terminator]> {
// No custom parsing/printing form.
let parser = ?;
let printer = ?;

// Fully specified by traits.
let verifier = ?;
}

def KrnlEntryPointOp : Op<Krnl_Dialect, "entry_point"> {
Expand Down Expand Up @@ -223,16 +224,16 @@ def KrnlGetRefOp : Op<Krnl_Dialect, "getref", [MemRefsNormalizable]> {
}]>,
];

let parser = ?;
let printer = ?;

let extraClassDeclaration = [{
/// Returns the symbolic operands (the ones in square brackets), which bind
/// to the symbols of the memref's layout map.
operand_range getDynamicSizes() {
return {operand_begin() + 2, operand_end()};
}
}];

let parser = ?;
let printer = ?;
}

def KrnlBlockOp : Op<Krnl_Dialect, "block"> {
Expand All @@ -243,9 +244,9 @@ def KrnlBlockOp : Op<Krnl_Dialect, "block"> {
means to block the for loop referred to by %i using a tile size of 4.
}];

let arguments = (ins
AnyType:$loop, I64Attr:$tile_size);
let arguments = (ins AnyType:$loop, I64Attr:$tile_size);
let results = (outs AnyType:$loop_block, AnyType:$loop_local);

let builders = [ OpBuilder<(ins "Value": $loop, "int64_t":$tile_size)> ];
let assemblyFormat = [{
$loop $tile_size attr-dict `:` functional-type($loop, results)
Expand Down Expand Up @@ -312,7 +313,7 @@ def KrnlPermuteOp : Op<Krnl_Dialect, "permute"> {
}];

let arguments = (ins Variadic<AnyType>:$loops, I64ArrayAttr:$map);
let results = (outs);

let builders = [ OpBuilder<(ins "ValueRange": $loops, "ArrayRef<int64_t>":$map)> ];
let assemblyFormat = [{
`(` $loops `)` $map attr-dict `:` type($loops)
Expand All @@ -330,7 +331,7 @@ def KrnlUnrollOp : Op<Krnl_Dialect, "unroll"> {
}];

let arguments = (ins AnyType:$loop);
let results = (outs);

let assemblyFormat = [{
$loop attr-dict `:` type($loop)
}];
Expand Down Expand Up @@ -507,6 +508,8 @@ def KrnlLoadOp : Op<Krnl_Dialect, "load",
$_state.types.push_back(memrefType.getElementType());
}]>];

let assemblyFormat = [{$memref `[` $indices `]` attr-dict `:` type($memref)}];

let extraClassDeclaration = [{
Value getMemRef() { return getOperand(0); }
void setMemRef(Value value) { setOperand(0, value); }
Expand All @@ -516,8 +519,6 @@ def KrnlLoadOp : Op<Krnl_Dialect, "load",

operand_range getIndices() { return {operand_begin() + 1, operand_end()}; }
}];

let assemblyFormat = [{$memref `[` $indices `]` attr-dict `:` type($memref)}];
}

def KrnlStoreOp : Op<Krnl_Dialect, "store",
Expand All @@ -544,6 +545,10 @@ def KrnlStoreOp : Op<Krnl_Dialect, "store",
$_state.addOperands(memref);
}]>];

let assemblyFormat = [{
$value `,` $memref `[` $indices `]` attr-dict `:` type($memref)
}];

let extraClassDeclaration = [{
Value getValueToStore() { return getOperand(0); }

Expand All @@ -557,10 +562,6 @@ def KrnlStoreOp : Op<Krnl_Dialect, "store",
return {operand_begin() + 2, operand_end()};
}
}];

let assemblyFormat = [{
$value `,` $memref `[` $indices `]` attr-dict `:` type($memref)
}];
}

def KrnlMovableOp : Op<Krnl_Dialect, "movable", [ImplicitKrnlTerminator]> {
Expand All @@ -576,8 +577,6 @@ def KrnlMovableOp : Op<Krnl_Dialect, "movable", [ImplicitKrnlTerminator]> {
are nested imperfectly between an "eager" and a "lazy" loop.
}];

let arguments = (ins );

let regions = (region AnyRegion:$region);

let assemblyFormat = [{
Expand All @@ -600,6 +599,7 @@ def KrnlGetInductionVariableValueOp : Op<Krnl_Dialect, "get_induction_var_value"

let arguments = (ins Variadic<AnyType> : $loops);
let results = (outs Variadic<AnyType> : $ind_var_vals);

let builders = [ OpBuilder<(ins "ValueRange": $loops)>];

let assemblyFormat = [{
Expand All @@ -611,7 +611,7 @@ def KrnlGetInductionVariableValueOp : Op<Krnl_Dialect, "get_induction_var_value"
// =============================================================================

def KrnlVectorTypeCastOp : Op<Krnl_Dialect, "vector_type_cast", [NoSideEffect,
MemRefsNormalizable, ViewLikeOpInterface]> {
MemRefsNormalizable, DeclareOpInterfaceMethods<CastOpInterface>, ViewLikeOpInterface]> {
let summary = "vector type cast operation";
let description = [{
The "vector_type_cast" operation converts a memref from an non-vector
Expand All @@ -627,30 +627,20 @@ def KrnlVectorTypeCastOp : Op<Krnl_Dialect, "vector_type_cast", [NoSideEffect,
let arguments = (ins AnyMemRef:$source);
let results = (outs AnyMemRef:$result);

let parser = ?;
let printer = ?;
let hasFolder = 1;
let builders = [ OpBuilder<(ins "Value": $source, "int64_t": $vectorLen)> ];

let verifier = [{ return impl::verifyCastOp(*this, areCastCompatible); }];
let assemblyFormat = [{
$source attr-dict `:` type($source) `to` type($result)
}];

let extraClassDeclaration = [{
/// Return true if `a` and `b` are valid operand and result pairs for
/// the operation.
static bool areCastCompatible(Type a, Type b);

/// The result of a vector_type_cast is always a memref.
MemRefType getType() { return getResult().getType().cast<MemRefType>(); }

/// Return the view source.
Value getViewSource() { return source(); }
}];

let hasFolder = 1;
let builders = [ OpBuilder<(ins "Value": $source, "int64_t": $vectorLen)> ];

let assemblyFormat = [{
$source attr-dict `:` type($source) `to` type($result)
}];

}

// =============================================================================
Expand All @@ -663,7 +653,6 @@ def KrnlSpecializedKernel : Op<Krnl_Dialect, "specialized_kernel",
}];

let arguments = (ins Variadic<AnyType> : $loops);
let results = (outs );

let assemblyFormat = [{
`(` $loops `)` attr-dict `:` type($loops)
Expand Down Expand Up @@ -841,7 +830,7 @@ def KrnlMatMulOp : Op<Krnl_Dialect, "matmul", [AttrSizedOperandSegments,
"bool": $overcompute)>
];

let verifier = [{ return ::verify(*this); }];
let hasVerifier = 1;

let assemblyFormat = [{
$A `[` $aMemStart `]` `,`
Expand Down Expand Up @@ -922,8 +911,9 @@ def KrnlCopyToBufferOp : Op<Krnl_Dialect, "copy_to_tile_buffer", [
"bool": $transpose)>
];

let verifier = [{ return ::verify(*this); }];
let assemblyFormat = [{
let hasVerifier = 1;

let assemblyFormat = [{
$buffer `,` $source `[` $starts `]` `,` $padValue attr-dict
`:` type($buffer) `,` type($source)
}];
Expand Down Expand Up @@ -955,8 +945,9 @@ def KrnlCopyFromBufferOp : Op<Krnl_Dialect, "copy_from_tile_buffer",
OpBuilder<(ins "Value": $buffer, "Value": $dest, "ValueRange": $starts)>
];

let verifier = [{ return ::verify(*this); }];
let assemblyFormat = [{
let hasVerifier = 1;

let assemblyFormat = [{
$buffer `,` $dest `[` $starts `]` attr-dict `:` type($buffer) `,` type($dest)
}];
}
Expand Down Expand Up @@ -984,6 +975,7 @@ def KrnlMemsetOp : Op<Krnl_Dialect, "memset", [MemRefsNormalizable,
}];

let arguments = (ins AnyMemRef:$dest, AnyType: $value);

let assemblyFormat = [{ $dest `,` $value attr-dict `:` type($dest) }];
}

Expand Down Expand Up @@ -1019,8 +1011,6 @@ def KrnlRandomNormalOp : Op<Krnl_Dialect, "random_normal",
AnyFloat:$mean,
AnyFloat:$scale,
AnyFloat:$seed);

let results = (outs );
}

def KrnlFindIndexOp : Op<Krnl_Dialect, "find_index",
Expand Down
Loading

0 comments on commit 3a45ee5

Please sign in to comment.