ArgInfo with ArgName and ImmArgPrinter

Author: DharuniRAcharya

llvm/include/llvm/IR/Intrinsics.td

@@ -87,14 +87,6 @@ class NoUndef<AttrIndex idx> : IntrinsicProperty {
   int ArgNo = idx.Value;
 }
 
-// ArgInfo - The specified argument has an argument name and an optional argument printing
-// function for diagnostic output.
-class ArgInfo<AttrIndex idx, string argname, string funcname = ""> : IntrinsicProperty {
-  int ArgNo = idx.Value;
-  string ArgName = argname;
-  string FunctionName = funcname;
-}
-
 // NonNull - The return value or specified argument is not null.
 class NonNull<AttrIndex idx> : IntrinsicProperty {
   int ArgNo = idx.Value;
@@ -150,6 +142,25 @@ class Range<AttrIndex idx, int lower, int upper> : IntrinsicProperty {
   int Upper = upper;
 }
 
+// ArgProperty - Base class for argument properties that can be specified in ArgInfo.
+class ArgProperty;
+
+// ArgName - Specifies the name of an argument for pretty-printing.
+class ArgName<string name> : ArgProperty {
+  string Name = name;
+}
+
+// ImmArgPrinter - Specifies a custom printer function for immediate arguments.
+class ImmArgPrinter<string funcname> : ArgProperty {
+  string FuncName = funcname;
+}
+
+// ArgInfo - The specified argument has properties defined by a list of ArgProperty objects.
+class ArgInfo<AttrIndex idx, list<ArgProperty> arg_properties> : IntrinsicProperty {
+  int ArgNo = idx.Value;
+  list<ArgProperty> Properties = arg_properties;
+}
+
 def IntrNoReturn : IntrinsicProperty;
 
 // Applied by default.

llvm/include/llvm/IR/IntrinsicsNVVM.td

@@ -2904,6 +2904,13 @@ foreach sp = [0, 1] in {
           ]
         );
 
+        defvar intrinsic_properties = !if(is_target_intrinsic, 
+          !listconcat(base_properties,
+            [ArgInfo<ArgIndex<nargs>, [ArgName<"kind">, ImmArgPrinter<"printTcgen05MMAKind">]>,
+             ArgInfo<ArgIndex<!add(nargs, 1)>, [ArgName<"cta_group">]>,
+             ArgInfo<ArgIndex<!add(nargs, 2)>, [ArgName<"collector">, ImmArgPrinter<"printTcgen05CollectorUsageOp">]>]),
+          base_properties);
+
         def mma.record_name:
               DefaultAttrsIntrinsicFlags<[], args, flags, intrinsic_properties,
                 mma.intr_name>;

llvm/test/TableGen/intrinsic-arginfo.td

@@ -14,8 +14,8 @@ def int_dummy_foo_bar : DefaultAttrsIntrinsic<
      llvm_i32_ty],     // stride
     [IntrNoMem,
      ImmArg<ArgIndex<1>>,
-     ArgInfo<ArgIndex<1>, "mode", "printDummyMode">,
-     ArgInfo<ArgIndex<2>, "stride">]>;
+     ArgInfo<ArgIndex<1>, [ArgName<"mode">, ImmArgPrinter<"printDummyMode">]>,
+     ArgInfo<ArgIndex<2>, [ArgName<"stride">]>]>;
 
 // A custom floating point add with rounding and sat mode.
 def int_my_fadd_f32 : DefaultAttrsIntrinsic<
@@ -27,8 +27,8 @@ def int_my_fadd_f32 : DefaultAttrsIntrinsic<
     [IntrNoMem,
      ImmArg<ArgIndex<2>>,
      ImmArg<ArgIndex<3>>,
-     ArgInfo<ArgIndex<2>, "rounding_mode", "printRoundingMode">,
-     ArgInfo<ArgIndex<3>, "saturation_mode">]>;
+     ArgInfo<ArgIndex<2>, [ArgName<"rounding_mode">, ImmArgPrinter<"printRoundingMode">]>,
+     ArgInfo<ArgIndex<3>, [ArgName<"saturation_mode">]>]>;
 
 // CHECK: #ifdef GET_INTRINSIC_PRETTY_PRINT_TABLE
 // CHECK-NEXT: static constexpr uint8_t PPTable[] = {

llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp

@@ -452,8 +452,23 @@ void CodeGenIntrinsic::setProperty(const Record *R) {
     if (ArgNo < 1)
       PrintFatalError(R->getLoc(),
                       "ArgInfo requires ArgNo >= 1 (0 is return value)");
-    StringRef ArgName = R->getValueAsString("ArgName");
-    StringRef FuncName = R->getValueAsString("FunctionName");
+    const ListInit *Properties = R->getValueAsListInit("Properties");
+    StringRef ArgName;
+    StringRef FuncName;
+    
+    for (const Init *PropInit : Properties->getElements()) {
+      if (const DefInit *PropDef = dyn_cast<DefInit>(PropInit)) {
+        const Record *PropRec = PropDef->getDef();
+        
+        if (PropRec->isSubClassOf("ArgName")) 
+          ArgName = PropRec->getValueAsString("Name");
+        else if (PropRec->isSubClassOf("ImmArgPrinter")) 
+          FuncName = PropRec->getValueAsString("FuncName");
+        else 
+          PrintFatalError(PropRec->getLoc(),
+                          "Unknown ArgProperty type: " + PropRec->getName());
+      }
+    }
     addPrettyPrintFunction(ArgNo - 1, ArgName, FuncName);
   } else {
     llvm_unreachable("Unknown property!");