Use ArrayRefParameter

Author: bcardosolopes

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

@@ -1386,9 +1386,9 @@ def ModuleFlagProfileSummaryDetailedAttr
     A `#llvm.profile_summary` may contain several of it.
     ```mlir
     llvm.module_flags [ ...
-        detailed_summary = [
-        #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-        #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
+        detailed_summary =
+        <cut_off = 10000, min_count = 86427, num_counts = 1>,
+        <cut_off = 100000, min_count = 86427, num_counts = 1>
     ```
   }];
   let parameters = (ins "uint32_t":$cut_off,
@@ -1409,10 +1409,10 @@ def ModuleFlagProfileSummaryAttr
         num_counts = 3712, num_functions = 796,
         is_partial_profile = 0 : i64,
         partial_profile_ratio = 0.000000e+00 : f64,
-        detailed_summary = [
-        #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-        #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
-    ]>>]
+        detailed_summary =
+          <cut_off = 10000, min_count = 86427, num_counts = 1>,
+          <cut_off = 100000, min_count = 86427, num_counts = 1>
+    >>]
     ```
   }];
   let parameters = (
@@ -1421,7 +1421,7 @@ def ModuleFlagProfileSummaryAttr
         "uint64_t":$num_counts, "uint64_t":$num_functions,
         OptionalParameter<"IntegerAttr">:$is_partial_profile,
         OptionalParameter<"FloatAttr">:$partial_profile_ratio,
-        "ArrayAttr":$detailed_summary);
+        ArrayRefParameter<"ModuleFlagProfileSummaryDetailedAttr">:$detailed_summary);
 
   let assemblyFormat = "`<` struct(params) `>`";
 }

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

@@ -346,9 +346,7 @@ static llvm::Metadata *convertModuleFlagProfileSummaryAttr(
   }
 
   SmallVector<llvm::Metadata *> detailedEntries;
-  for (auto detailedEntry :
-       summaryAttr.getDetailedSummary()
-           .getAsRange<ModuleFlagProfileSummaryDetailedAttr>()) {
+  for (auto detailedEntry : summaryAttr.getDetailedSummary()) {
     SmallVector<llvm::Metadata *> tupleNodes{
         mdb.createConstant(llvm::ConstantInt::get(
             llvm::Type::getInt64Ty(context), detailedEntry.getCutOff())),

mlir/lib/Target/LLVMIR/ModuleImport.cpp

@@ -688,17 +688,19 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
     return failure();
   };
 
-  auto getSummary = [&](const llvm::MDOperand &summaryMD) -> ArrayAttr {
+  auto getSummary = [&](const llvm::MDOperand &summaryMD,
+                        SmallVectorImpl<ModuleFlagProfileSummaryDetailedAttr>
+                            &detailedSummary) {
     auto *tupleEntry = getMDTuple(summaryMD);
     if (!tupleEntry)
-      return nullptr;
+      return false;
 
     llvm::MDString *keyMD = dyn_cast<llvm::MDString>(tupleEntry->getOperand(0));
     if (!keyMD || keyMD->getString() != "DetailedSummary") {
       emitWarning(mlirModule.getLoc())
           << "expected 'DetailedSummary' key: "
           << diagMD(tupleEntry->getOperand(0), llvmModule);
-      return nullptr;
+      return false;
     }
 
     llvm::MDTuple *entriesMD =
@@ -707,17 +709,16 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
       emitWarning(mlirModule.getLoc())
           << "expected tuple value for 'DetailedSummary' key: "
           << diagMD(tupleEntry->getOperand(1), llvmModule);
-      return nullptr;
+      return false;
     }
 
-    SmallVector<Attribute> detailedSummary;
     for (auto &&entry : entriesMD->operands()) {
       llvm::MDTuple *entryMD = dyn_cast<llvm::MDTuple>(entry);
       if (!entryMD || entryMD->getNumOperands() != 3) {
         emitWarning(mlirModule.getLoc())
             << "'DetailedSummary' entry expects 3 operands: "
             << diagMD(entry, llvmModule);
-        return nullptr;
+        return false;
       }
       llvm::ConstantAsMetadata *op0 =
           dyn_cast<llvm::ConstantAsMetadata>(entryMD->getOperand(0));
@@ -730,7 +731,7 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
         emitWarning(mlirModule.getLoc())
             << "expected only integer entries in 'DetailedSummary': "
             << diagMD(entry, llvmModule);
-        return nullptr;
+        return false;
       }
 
       auto detaildSummaryEntry = ModuleFlagProfileSummaryDetailedAttr::get(
@@ -740,7 +741,7 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
           cast<llvm::ConstantInt>(op2->getValue())->getZExtValue());
       detailedSummary.push_back(detaildSummaryEntry);
     }
-    return ArrayAttr::get(mlirModule->getContext(), detailedSummary);
+    return true;
   };
 
   // Build ModuleFlagProfileSummaryAttr by sequentially fetching elements in
@@ -787,8 +788,8 @@ convertProfileSummaryModuleFlagValue(ModuleOp mlirModule,
     summayIdx++;
 
   // Handle detailed summary.
-  ArrayAttr detailedSummary = getSummary(mdTuple->getOperand(summayIdx));
-  if (!detailedSummary)
+  SmallVector<ModuleFlagProfileSummaryDetailedAttr> detailedSummary;
+  if (!getSummary(mdTuple->getOperand(summayIdx), detailedSummary))
     return nullptr;
 
   // Build the final profile summary attribute.

mlir/test/Dialect/LLVMIR/invalid.mlir

@@ -1814,10 +1814,10 @@ llvm.module_flags [#llvm.mlir.module_flag<error, "ProfileSummary",
        num_counts = 3712, num_functions = 796,
        is_partial_profile = 0 : i64,
        partial_profile_ratio = 0.000000e+00 : f64,
-       detailed_summary = [
-         #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-         #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
-]>>]
+       detailed_summary =
+         <cut_off = 10000, min_count = 86427, num_counts = 1>,
+         <cut_off = 100000, min_count = 86427, num_counts = 1>
+>>]
 
 // -----
 

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

@@ -18,10 +18,10 @@ module {
                          num_counts = 3712, num_functions = 796,
                          is_partial_profile = 0 : i64,
                          partial_profile_ratio = 0.000000e+00 : f64,
-                         detailed_summary = [
-                           #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-                           #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
-                    ]>>]
+                         detailed_summary =
+                           <cut_off = 10000, min_count = 86427, num_counts = 1>,
+                           <cut_off = 100000, min_count = 86427, num_counts = 1>
+                    >>]
 }
 
 // CHECK: llvm.module_flags [
@@ -42,9 +42,9 @@ module {
 // CHECK-SAME:      num_counts = 3712, num_functions = 796,
 // CHECK-SAME:      is_partial_profile = 0 : i64,
 // CHECK-SAME:      partial_profile_ratio = 0.000000e+00 : f64,
-// CHECK-SAME:      detailed_summary = [
-// CHECK-SAME:        #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-// CHECK-SAME:        #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
-// CHECK-SAME: ]>>]
+// CHECK-SAME:      detailed_summary =
+// CHECK-SAME:        <cut_off = 10000, min_count = 86427, num_counts = 1>,
+// CHECK-SAME:        <cut_off = 100000, min_count = 86427, num_counts = 1>
+// CHECK-SAME: >>]
 
 llvm.module_flags []

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

@@ -62,10 +62,10 @@ declare void @to()
 ; 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: partial_profile_ratio = 0.000000e+00 : f64,
-; CHECK-SAME: detailed_summary = [
-; CHECK-SAME: #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-; CHECK-SAME: #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
-; CHECK-SAME: ]>>]
+; CHECK-SAME: detailed_summary =
+; CHECK-SAME: <cut_off = 10000, min_count = 86427, num_counts = 1>,
+; CHECK-SAME: <cut_off = 100000, min_count = 86427, num_counts = 1>
+; CHECK-SAME: >>]
 
 ; // -----
 
@@ -91,7 +91,7 @@ declare void @to()
 ; 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,
-; CHECK-SAME: detailed_summary = [
-; CHECK-SAME: #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-; CHECK-SAME: #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
-; CHECK-SAME: ]>>]
+; CHECK-SAME: detailed_summary =
+; CHECK-SAME: <cut_off = 10000, min_count = 86427, num_counts = 1>,
+; CHECK-SAME: <cut_off = 100000, min_count = 86427, num_counts = 1>
+; CHECK-SAME: >>]

mlir/test/Target/LLVMIR/llvmir.mlir

@@ -2889,10 +2889,10 @@ llvm.module_flags [#llvm.mlir.module_flag<error, "ProfileSummary",
                          num_counts = 3712, num_functions = 796,
                          is_partial_profile = 0 : i64,
                          partial_profile_ratio = 0.000000e+00 : f64,
-                         detailed_summary = [
-                           #llvm.profile_summary_detailed<cut_off = 10000, min_count = 86427, num_counts = 1>,
-                           #llvm.profile_summary_detailed<cut_off = 100000, min_count = 86427, num_counts = 1>
-                  ]>>]
+                         detailed_summary =
+                           <cut_off = 10000, min_count = 86427, num_counts = 1>,
+                           <cut_off = 100000, min_count = 86427, num_counts = 1>
+                  >>]
 
 // CHECK: !llvm.module.flags = !{!0, !15}