fx

Author: grypp

mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td

@@ -418,7 +418,7 @@ def NVVM_PMEventOp : NVVM_PTXBuilder_Op<"pmevent">,
     immediate operand a, in the range 0..15.
 
     With `mask` it triggers one or more of the performance monitor events. Each
-    bit in the 16-bit immediate operand a controls an event.
+    bit in the 16-bit immediate operand controls an event.
 
     [For more information, see PTX ISA](https://docs.nvidia.com/cuda/parallel-thread-execution/index.html#miscellaneous-instructions-pmevent)
   }];
@@ -431,7 +431,7 @@ def NVVM_PMEventOp : NVVM_PTXBuilder_Op<"pmevent">,
   let assemblyFormat = "attr-dict (`id` `=` $eventId^)? (`mask` `=` $maskedEventId^)?";
 
   let extraClassDeclaration = [{
-    bool hasIntrinsic() { if(getEventId()) return false; return true; }
+    bool hasIntrinsic() { return !getEventId(); }
   }];
   let extraClassDefinition = [{
     std::string $cppClass::getPtx() { return std::string("pmevent %0;"); }

mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp

@@ -190,16 +190,18 @@ LogicalResult BulkStoreOp::verify() {
 }
 
 LogicalResult PMEventOp::verify() {
-  if (!getMaskedEventId() && !getEventId()) {
+  auto eventId = getEventId();
+  auto maskedEventId = getMaskedEventId();
+  if (!maskedEventId && !eventId) {
     return emitOpError() << "either `id` or `mask` must be set";
   }
 
-  if (getMaskedEventId() && getEventId()) {
+  if (maskedEventId && eventId) {
     return emitOpError() << "`id` and `mask` cannot be set at the same time";
   }
 
-  if (getEventId()) {
-    if (getEventId() < 0 || getEventId() > 15) {
+  if (eventId) {
+    if (eventId < 0 || eventId > 15) {
       return emitOpError() << "`id` must be between 0 and 15";
     }
   }