Skip to content

Commit ef72cf4

Browse files
committed
[mlir][NFC] Update OpenACC/OpenMP operations to use hasVerifier instead of verifier
The verifier field is deprecated, and slated for removal. Differential Revision: https://reviews.llvm.org/D118825
1 parent b98dc03 commit ef72cf4

File tree

5 files changed

+171
-186
lines changed

5 files changed

+171
-186
lines changed

mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class OpenACC_Op<string mnemonic, list<Trait> traits = []> :
3737
Op<OpenACC_Dialect, mnemonic, traits> {
3838

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

@@ -153,8 +152,6 @@ def OpenACC_ParallelOp : OpenACC_Op<"parallel",
153152
/// The i-th data operand passed.
154153
Value getDataOperand(unsigned i);
155154
}];
156-
157-
let verifier = ?;
158155
}
159156

160157
//===----------------------------------------------------------------------===//
@@ -225,6 +222,7 @@ def OpenACC_DataOp : OpenACC_Op<"data",
225222
( `attach` `(` $attachOperands^ `:` type($attachOperands) `)` )?
226223
$region attr-dict-with-keyword
227224
}];
225+
let hasVerifier = 1;
228226
}
229227

230228
def OpenACC_TerminatorOp : OpenACC_Op<"terminator", [Terminator]> {
@@ -237,8 +235,6 @@ def OpenACC_TerminatorOp : OpenACC_Op<"terminator", [Terminator]> {
237235
to the enclosing op.
238236
}];
239237

240-
let verifier = ?;
241-
242238
let assemblyFormat = "attr-dict";
243239
}
244240

@@ -292,6 +288,7 @@ def OpenACC_EnterDataOp : OpenACC_Op<"enter_data", [AttrSizedOperandSegments]> {
292288
}];
293289

294290
let hasCanonicalizer = 1;
291+
let hasVerifier = 1;
295292
}
296293

297294
//===----------------------------------------------------------------------===//
@@ -342,6 +339,7 @@ def OpenACC_ExitDataOp : OpenACC_Op<"exit_data", [AttrSizedOperandSegments]> {
342339
}];
343340

344341
let hasCanonicalizer = 1;
342+
let hasVerifier = 1;
345343
}
346344

347345
//===----------------------------------------------------------------------===//
@@ -406,8 +404,7 @@ def OpenACC_LoopOp : OpenACC_Op<"loop",
406404
static StringRef getPrivateKeyword() { return "private"; }
407405
static StringRef getReductionKeyword() { return "reduction"; }
408406
}];
409-
410-
let verifier = [{ return ::verifyLoopOp(*this); }];
407+
let hasVerifier = 1;
411408
}
412409

413410
// Yield operation for the acc.loop and acc.parallel operations.
@@ -425,8 +422,6 @@ def OpenACC_YieldOp : OpenACC_Op<"yield", [Terminator,
425422

426423
let builders = [OpBuilder<(ins), [{ /* nothing to do */ }]>];
427424

428-
let verifier = ?;
429-
430425
let assemblyFormat = "attr-dict ($operands^ `:` type($operands))?";
431426
}
432427

@@ -458,6 +453,7 @@ def OpenACC_InitOp : OpenACC_Op<"init", [AttrSizedOperandSegments]> {
458453
( `device_num` `(` $deviceNumOperand^ `:` type($deviceNumOperand) `)` )?
459454
( `if` `(` $ifCond^ `)` )? attr-dict-with-keyword
460455
}];
456+
let hasVerifier = 1;
461457
}
462458

463459
//===----------------------------------------------------------------------===//
@@ -488,6 +484,7 @@ def OpenACC_ShutdownOp : OpenACC_Op<"shutdown", [AttrSizedOperandSegments]> {
488484
( `device_num` `(` $deviceNumOperand^ `:` type($deviceNumOperand) `)` )?
489485
( `if` `(` $ifCond^ `)` )? attr-dict-with-keyword
490486
}];
487+
let hasVerifier = 1;
491488
}
492489

493490
//===----------------------------------------------------------------------===//
@@ -542,6 +539,7 @@ def OpenACC_UpdateOp : OpenACC_Op<"update", [AttrSizedOperandSegments]> {
542539
}];
543540

544541
let hasCanonicalizer = 1;
542+
let hasVerifier = 1;
545543
}
546544

547545
//===----------------------------------------------------------------------===//
@@ -575,6 +573,7 @@ def OpenACC_WaitOp : OpenACC_Op<"wait", [AttrSizedOperandSegments]> {
575573
( `wait_devnum` `(` $waitDevnum^ `:` type($waitDevnum) `)` )?
576574
( `if` `(` $ifCond^ `)` )? attr-dict-with-keyword
577575
}];
576+
let hasVerifier = 1;
578577
}
579578

580579
#endif // OPENACC_OPS

mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def ParallelOp : OpenMP_Op<"parallel", [AttrSizedOperandSegments,
128128
];
129129
let parser = [{ return parseParallelOp(parser, result); }];
130130
let printer = [{ return printParallelOp(p, *this); }];
131-
let verifier = [{ return ::verifyParallelOp(*this); }];
131+
let hasVerifier = 1;
132132
}
133133

134134
def TerminatorOp : OpenMP_Op<"terminator", [Terminator]> {
@@ -217,7 +217,7 @@ def SectionsOp : OpenMP_Op<"sections", [AttrSizedOperandSegments]> {
217217

218218
let parser = [{ return parseSectionsOp(parser, result); }];
219219
let printer = [{ return printSectionsOp(p, *this); }];
220-
let verifier = [{ return verifySectionsOp(*this); }];
220+
let hasVerifier = 1;
221221
}
222222

223223
//===----------------------------------------------------------------------===//
@@ -336,7 +336,7 @@ def WsLoopOp : OpenMP_Op<"wsloop", [AttrSizedOperandSegments,
336336
}];
337337
let parser = [{ return parseWsLoopOp(parser, result); }];
338338
let printer = [{ return printWsLoopOp(p, *this); }];
339-
let verifier = [{ return ::verifyWsLoopOp(*this); }];
339+
let hasVerifier = 1;
340340
}
341341

342342
def YieldOp : OpenMP_Op<"yield",
@@ -457,8 +457,7 @@ def CriticalDeclareOp : OpenMP_Op<"critical.declare", [Symbol]> {
457457
let assemblyFormat = [{
458458
$sym_name custom<SynchronizationHint>($hint) attr-dict
459459
}];
460-
461-
let verifier = "return verifyCriticalDeclareOp(*this);";
460+
let hasVerifier = 1;
462461
}
463462

464463

@@ -476,8 +475,7 @@ def CriticalOp : OpenMP_Op<"critical"> {
476475
let assemblyFormat = [{
477476
(`(` $name^ `)`)? $region attr-dict
478477
}];
479-
480-
let verifier = "return ::verifyCriticalOp(*this);";
478+
let hasVerifier = 1;
481479
}
482480

483481
//===----------------------------------------------------------------------===//
@@ -540,8 +538,7 @@ def OrderedOp : OpenMP_Op<"ordered"> {
540538
( `depend_vec` `(` $depend_vec_vars^ `:` type($depend_vec_vars) `)` )?
541539
attr-dict
542540
}];
543-
544-
let verifier = "return ::verifyOrderedOp(*this);";
541+
let hasVerifier = 1;
545542
}
546543

547544
def OrderedRegionOp : OpenMP_Op<"ordered_region"> {
@@ -561,8 +558,7 @@ def OrderedRegionOp : OpenMP_Op<"ordered_region"> {
561558
let regions = (region AnyRegion:$region);
562559

563560
let assemblyFormat = [{ ( `simd` $simd^ )? $region attr-dict}];
564-
565-
let verifier = "return ::verifyOrderedRegionOp(*this);";
561+
let hasVerifier = 1;
566562
}
567563

568564
//===----------------------------------------------------------------------===//
@@ -614,7 +610,7 @@ def AtomicReadOp : OpenMP_Op<"atomic.read"> {
614610
OptionalAttr<MemoryOrderKindAttr>:$memory_order);
615611
let parser = [{ return parseAtomicReadOp(parser, result); }];
616612
let printer = [{ return printAtomicReadOp(p, *this); }];
617-
let verifier = [{ return verifyAtomicReadOp(*this); }];
613+
let hasVerifier = 1;
618614
}
619615

620616
def AtomicWriteOp : OpenMP_Op<"atomic.write"> {
@@ -643,7 +639,7 @@ def AtomicWriteOp : OpenMP_Op<"atomic.write"> {
643639
OptionalAttr<MemoryOrderKindAttr>:$memory_order);
644640
let parser = [{ return parseAtomicWriteOp(parser, result); }];
645641
let printer = [{ return printAtomicWriteOp(p, *this); }];
646-
let verifier = [{ return verifyAtomicWriteOp(*this); }];
642+
let hasVerifier = 1;
647643
}
648644

649645
// TODO: autogenerate from OMP.td in future if possible.
@@ -708,7 +704,7 @@ def AtomicUpdateOp : OpenMP_Op<"atomic.update"> {
708704
OptionalAttr<MemoryOrderKindAttr>:$memory_order);
709705
let parser = [{ return parseAtomicUpdateOp(parser, result); }];
710706
let printer = [{ return printAtomicUpdateOp(p, *this); }];
711-
let verifier = [{ return verifyAtomicUpdateOp(*this); }];
707+
let hasVerifier = 1;
712708
}
713709

714710
def AtomicCaptureOp : OpenMP_Op<"atomic.capture",
@@ -752,7 +748,7 @@ def AtomicCaptureOp : OpenMP_Op<"atomic.capture",
752748
let regions = (region SizedRegion<1>:$region);
753749
let parser = [{ return parseAtomicCaptureOp(parser, result); }];
754750
let printer = [{ return printAtomicCaptureOp(p, *this); }];
755-
let verifier = [{ return verifyAtomicCaptureOp(*this); }];
751+
let hasVerifier = 1;
756752
}
757753

758754
//===----------------------------------------------------------------------===//
@@ -789,7 +785,6 @@ def ReductionDeclareOp : OpenMP_Op<"reduction.declare", [Symbol]> {
789785
let regions = (region AnyRegion:$initializerRegion,
790786
AnyRegion:$reductionRegion,
791787
AnyRegion:$atomicReductionRegion);
792-
let verifier = "return ::verifyReductionDeclareOp(*this);";
793788

794789
let assemblyFormat = "$sym_name `:` $type attr-dict-with-keyword "
795790
"`init` $initializerRegion "
@@ -804,6 +799,7 @@ def ReductionDeclareOp : OpenMP_Op<"reduction.declare", [Symbol]> {
804799
return atomicReductionRegion().front().getArgument(0).getType();
805800
}
806801
}];
802+
let hasVerifier = 1;
807803
}
808804

809805
//===----------------------------------------------------------------------===//
@@ -826,7 +822,7 @@ def ReductionOp : OpenMP_Op<"reduction", [
826822
let arguments= (ins AnyType:$operand, OpenMP_PointerLikeType:$accumulator);
827823
let assemblyFormat =
828824
"$operand `,` $accumulator attr-dict `:` type($accumulator)";
829-
let verifier = "return ::verifyReductionOp(*this);";
825+
let hasVerifier = 1;
830826
}
831827

832828
#endif // OPENMP_OPS

0 commit comments

Comments
 (0)