Use std::optional when possible for attr params

Author: bcardosolopes

mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td

@@ -1407,7 +1407,7 @@ def ModuleFlagProfileSummaryAttr
       #llvm.profile_summary<format = "InstrProf", total_count = 263646, max_count = 86427,
         max_internal_count = 86427, max_function_count = 4691,
         num_counts = 3712, num_functions = 796,
-        is_partial_profile = 0 : i64,
+        is_partial_profile = 0,
         partial_profile_ratio = 0.000000e+00 : f64,
         detailed_summary =
           <cut_off = 10000, min_count = 86427, num_counts = 1>,
@@ -1419,7 +1419,7 @@ def ModuleFlagProfileSummaryAttr
     ins "StringAttr":$format, "uint64_t":$total_count, "uint64_t":$max_count,
         "uint64_t":$max_internal_count, "uint64_t":$max_function_count,
         "uint64_t":$num_counts, "uint64_t":$num_functions,
-        OptionalParameter<"IntegerAttr">:$is_partial_profile,
+        OptionalParameter<"std::optional<uint64_t>">:$is_partial_profile,
         OptionalParameter<"FloatAttr">:$partial_profile_ratio,
         ArrayRefParameter<"ModuleFlagProfileSummaryDetailedAttr">:$detailed_summary);
 

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

@@ -333,8 +333,8 @@ static llvm::Metadata *convertModuleFlagProfileSummaryAttr(
   };
 
   if (summaryAttr.getIsPartialProfile())
-    vals.push_back(getIntTuple("IsPartialProfile",
-                               summaryAttr.getIsPartialProfile().getUInt()));
+    vals.push_back(
+        getIntTuple("IsPartialProfile", *summaryAttr.getIsPartialProfile()));
 
   if (summaryAttr.getPartialProfileRatio()) {
     SmallVector<llvm::Metadata *> tupleNodes{

mlir/lib/Target/LLVMIR/ModuleImport.cpp

@@ -657,16 +657,15 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
   };
 
   auto getOptIntValue = [&](const llvm::MDOperand &md, StringRef matchKey,
-                            IntegerAttr &attr) -> LogicalResult {
+                            std::optional<uint64_t> &val) -> LogicalResult {
     if (!getConstantMD(md, matchKey, /*optional=*/true))
       return success();
     if (checkOptionalPosition(md, matchKey).failed())
       return failure();
-    uint64_t val = 0;
-    if (!getInt64Value(md, matchKey, val))
+    uint64_t tmpVal = 0;
+    if (!getInt64Value(md, matchKey, tmpVal))
       return failure();
-    attr =
-        IntegerAttr::get(IntegerType::get(mlirModule->getContext(), 64), val);
+    val = tmpVal;
     return success();
   };
 
@@ -771,12 +770,12 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
     return nullptr;
 
   // Handle optional keys.
-  IntegerAttr isPartialProfile;
+  std::optional<uint64_t> isPartialProfile;
   if (getOptIntValue(mdTuple->getOperand(summayIdx), "IsPartialProfile",
                      isPartialProfile)
           .failed())
     return nullptr;
-  if (isPartialProfile)
+  if (isPartialProfile.has_value())
     summayIdx++;
 
   FloatAttr partialProfileRatio;
@@ -795,8 +794,7 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
   // Build the final profile summary attribute.
   return ModuleFlagProfileSummaryAttr::get(
       mlirModule->getContext(), format, totalCount, maxCount, maxInternalCount,
-      maxFunctionCount, numCounts, numFunctions,
-      isPartialProfile ? isPartialProfile : nullptr,
+      maxFunctionCount, numCounts, numFunctions, isPartialProfile,
       partialProfileRatio ? partialProfileRatio : nullptr, detailedSummary);
 }
 

mlir/test/Dialect/LLVMIR/invalid.mlir

@@ -1812,7 +1812,7 @@ llvm.module_flags [#llvm.mlir.module_flag<error, "ProfileSummary",
      #llvm.profile_summary<format = "YoloFmt", total_count = 263646, max_count = 86427,
        max_internal_count = 86427, max_function_count = 4691,
        num_counts = 3712, num_functions = 796,
-       is_partial_profile = 0 : i64,
+       is_partial_profile = 0,
        partial_profile_ratio = 0.000000e+00 : f64,
        detailed_summary =
          <cut_off = 10000, min_count = 86427, num_counts = 1>,

mlir/test/Dialect/LLVMIR/module-roundtrip.mlir

@@ -16,7 +16,7 @@ module {
                        #llvm.profile_summary<format = "InstrProf", total_count = 263646, max_count = 86427,
                          max_internal_count = 86427, max_function_count = 4691,
                          num_counts = 3712, num_functions = 796,
-                         is_partial_profile = 0 : i64,
+                         is_partial_profile = 0,
                          partial_profile_ratio = 0.000000e+00 : f64,
                          detailed_summary =
                            <cut_off = 10000, min_count = 86427, num_counts = 1>,
@@ -40,7 +40,7 @@ module {
 // CHECK-SAME:    #llvm.profile_summary<format = "InstrProf", total_count = 263646, max_count = 86427,
 // CHECK-SAME:      max_internal_count = 86427, max_function_count = 4691,
 // CHECK-SAME:      num_counts = 3712, num_functions = 796,
-// CHECK-SAME:      is_partial_profile = 0 : i64,
+// CHECK-SAME:      is_partial_profile = 0,
 // CHECK-SAME:      partial_profile_ratio = 0.000000e+00 : f64,
 // CHECK-SAME:      detailed_summary =
 // CHECK-SAME:        <cut_off = 10000, min_count = 86427, num_counts = 1>,

mlir/test/Target/LLVMIR/Import/module-flags.ll

@@ -60,7 +60,7 @@ declare void @to()
 ; CHECK: llvm.module_flags [#llvm.mlir.module_flag<error, "ProfileSummary",
 ; CHECK-SAME: #llvm.profile_summary<format = "InstrProf", total_count = 263646,
 ; CHECK-SAME: max_count = 86427, max_internal_count = 86427, max_function_count = 4691,
-; CHECK-SAME: num_counts = 3712, num_functions = 796, is_partial_profile = 0 : i64,
+; CHECK-SAME: num_counts = 3712, num_functions = 796, is_partial_profile = 0,
 ; CHECK-SAME: partial_profile_ratio = 0.000000e+00 : f64,
 ; CHECK-SAME: detailed_summary =
 ; CHECK-SAME: <cut_off = 10000, min_count = 86427, num_counts = 1>,

mlir/test/Target/LLVMIR/llvmir.mlir

@@ -2887,7 +2887,7 @@ llvm.module_flags [#llvm.mlir.module_flag<error, "ProfileSummary",
                        #llvm.profile_summary<format = "InstrProf", total_count = 263646, max_count = 86427,
                          max_internal_count = 86427, max_function_count = 4691,
                          num_counts = 3712, num_functions = 796,
-                         is_partial_profile = 0 : i64,
+                         is_partial_profile = 0,
                          partial_profile_ratio = 0.000000e+00 : f64,
                          detailed_summary =
                            <cut_off = 10000, min_count = 86427, num_counts = 1>,