Restructure the Test dialect ODS to include the AttrDef in TestOps.td (NFC)

[mehdi_amini]

Summary

This structure is necessary to be able to use AttrDef as arguments on operations.

[rriddle]

It would likely be cleaner in the long run to move the Test dialect definition to its own .td file.

[mehdi_amini]

In D113327#3113280, @rriddle wrote:

It would likely be cleaner in the long run to move the Test dialect definition to its own .td file.

Right, but we would still need to include the "TestAttrDefs.td" in the "TestOps.td" file right?

[rriddle]

In D113327#3113301, @mehdi_amini wrote:

In D113327#3113280, @rriddle wrote:

It would likely be cleaner in the long run to move the Test dialect definition to its own .td file.

Right, but we would still need to include the "TestAttrDefs.td" in the "TestOps.td" file right?

• To get the parseAttr/printAttr accessors to be auto-generated?

Not technically, the constraint there (which should really be cleaned up now that attributes/types can be defined in ODS) is that there is an instance of DialectAttr/DialectType that uses that dialect.

• To access the attributes in the op arguments field?

Yeah, the file would need to be included to access the ODS definitions for the attributes.

mlir/test/lib/Dialect/Test/TestOps.td

57–58

Why is this included here and not at the top of the file with the other includes?

[mehdi_amini]

Yeah, the file would need to be included to access the ODS definitions for the attributes.

Right, that's what I meant.

mlir/test/lib/Dialect/Test/TestOps.td

57–58

The AttrDef needs to access the Test_Dialect def. We could move the Test_Dialect def outside of the ops file and include it in both...

mlir/test/lib/Dialect/Test/CMakeLists.txt

 set(LLVM_OPTIONAL_SOURCES
   TestDialect.cpp
   TestPatterns.cpp
   TestTraits.cpp
 )
 
 set(LLVM_TARGET_DEFINITIONS TestInterfaces.td)
 mlir_tablegen(TestAttrInterfaces.h.inc -gen-attr-interface-decls)
 mlir_tablegen(TestAttrInterfaces.cpp.inc -gen-attr-interface-defs)
 mlir_tablegen(TestTypeInterfaces.h.inc -gen-type-interface-decls)
 mlir_tablegen(TestTypeInterfaces.cpp.inc -gen-type-interface-defs)
 mlir_tablegen(TestOpInterfaces.h.inc -gen-op-interface-decls)
 mlir_tablegen(TestOpInterfaces.cpp.inc -gen-op-interface-defs)
 add_public_tablegen_target(MLIRTestInterfaceIncGen)
 
-set(LLVM_TARGET_DEFINITIONS TestAttrDefs.td)
+set(LLVM_TARGET_DEFINITIONS TestOps.td)
 mlir_tablegen(TestAttrDefs.h.inc -gen-attrdef-decls)
 mlir_tablegen(TestAttrDefs.cpp.inc -gen-attrdef-defs)
 add_public_tablegen_target(MLIRTestAttrDefIncGen)
 
 set(LLVM_TARGET_DEFINITIONS TestTypeDefs.td)
 mlir_tablegen(TestTypeDefs.h.inc -gen-typedef-decls -typedefs-dialect=test)
 mlir_tablegen(TestTypeDefs.cpp.inc -gen-typedef-defs -typedefs-dialect=test)
 add_public_tablegen_target(MLIRTestTypeDefIncGen)

mlir/test/lib/Dialect/Test/TestDialect.h

 //===- TestDialect.h - MLIR Dialect for testing -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines a fake 'test' dialect that can be used for testing things
 // that do not have a respective counterpart in the main source directories.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef MLIR_TESTDIALECT_H
 #define MLIR_TESTDIALECT_H
 
+#include "TestAttributes.h"
 #include "TestInterfaces.h"
 #include "mlir/Dialect/DLTI/DLTI.h"
 #include "mlir/Dialect/DLTI/Traits.h"
 #include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 #include "mlir/Dialect/Traits.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"

mlir/test/lib/Dialect/Test/TestOps.td

def Test_Dialect : Dialect {
   let hasOperationInterfaceFallback = 1;
   let hasNonDefaultDestructor = 1;
   let dependentDialects = ["::mlir::DLTIDialect"];
 
   let extraClassDeclaration = [{
     void registerAttributes();
     void registerTypes();
 
-    ::mlir::Attribute parseAttribute(::mlir::DialectAsmParser &parser,
-                                     ::mlir::Type type) const override;
-    void printAttribute(::mlir::Attribute attr,
-                        ::mlir::DialectAsmPrinter &printer) const override;
-
     // Provides a custom printing/parsing for some operations.
     ::llvm::Optional<ParseOpHook>
       getParseOperationHook(::llvm::StringRef opName) const override;
     ::llvm::unique_function<void(::mlir::Operation *,
                                  ::mlir::OpAsmPrinter &printer)>
      getOperationPrinter(::mlir::Operation *op) const override;
 
   private:
     // Storage for a custom fallback interface.
     void *fallbackEffectOpInterfaces;
 
   }];
 }
 
+// Include the attribute definitions.
+include "TestAttrDefs.td"
+
+
 class TEST_Op<string mnemonic, list<OpTrait> traits = []> :
     Op<Test_Dialect, mnemonic, traits>;
 
 //===----------------------------------------------------------------------===//
 // Test Types
 //===----------------------------------------------------------------------===//
 
 def IntTypesOp : TEST_Op<"int_types"> {
def FormatOptionalEnumAttr : TEST_Op<"format_optional_enum_attr"> {
   let assemblyFormat = "($attr^)? attr-dict";
 }
 
 def FormatOptionalWithElse : TEST_Op<"format_optional_else"> {
   let arguments = (ins UnitAttr:$isFirstBranchPresent);
   let assemblyFormat = "(`then` $isFirstBranchPresent^):(`else`)? attr-dict";
 }
 
+def FormatCompoundAttr : TEST_Op<"format_compound_attr"> {
+  let arguments = (ins CompoundAttrA:$compound);
+  let assemblyFormat = "$compound attr-dict-with-keyword";
+}
+
 //===----------------------------------------------------------------------===//
 // Custom Directives
 
 def FormatCustomDirectiveOperands
     : TEST_Op<"format_custom_directive_operands", [AttrSizedOperandSegments]> {
   let arguments = (ins I64:$operand, Optional<I64>:$optOperand,
                        Variadic<I64>:$varOperands);
   let assemblyFormat = [{

mlir/test/mlir-tblgen/op-format.mlir

 
 // CHECK: test.format_optional_else then
 test.format_optional_else then
 
 // CHECK: test.format_optional_else else
 test.format_optional_else else
 
 //===----------------------------------------------------------------------===//
+// Format a custom attribute
+//===----------------------------------------------------------------------===//
+
+// CHECK: test.format_compound_attr #test.cmpnd_a<1, !test.smpla, [5, 6]>
+test.format_compound_attr #test.cmpnd_a<1, !test.smpla, [5, 6]>
+
+//===----------------------------------------------------------------------===//
 // Format custom directives
 //===----------------------------------------------------------------------===//
 
 // CHECK: test.format_custom_directive_operands %[[I64]], %[[I64]] -> (%[[I64]])
 test.format_custom_directive_operands %i64, %i64 -> (%i64)
 
 // CHECK: test.format_custom_directive_operands %[[I64]] -> (%[[I64]])
 test.format_custom_directive_operands %i64 -> (%i64)

utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel

tbl_outs = [
             "lib/Dialect/Test/TestAttrDefs.h.inc",
         ),
         (
             ["-gen-attrdef-defs"],
             "lib/Dialect/Test/TestAttrDefs.cpp.inc",
         ),
     ],
     tblgen = "//mlir:mlir-tblgen",
-    td_file = "lib/Dialect/Test/TestAttrDefs.td",
+    td_file = "lib/Dialect/Test/TestOps.td",
     test = True,
     deps = [
         ":TestOpTdFiles",
     ],
 )
 
 gentbl_cc_library(
     name = "TestTypeDefsIncGen",