[CIR] Merge the mlir::cir namespace into cir (#1084)

#1025 explains why we want to move
the CIR dialect from the `mlir::cir` to the `cir` namespace.

This is a large PR, and I've split it out into four commits (that'll be
squashed when landing). The first commit changes `mlir::cir` to `cir`
everywhere. This was originally done mechanically with:

```
find clang \( -name '*.h' -o -name '*.cpp' -o -name '*.td' \) -print0 | xargs -0 perl -pi -e 's/mlir::cir/cir/g'
find clang \( -name '*.h' -o -name '*.cpp' \) -print0 | xargs -0 perl -pi -e 's/::cir/cir/g'
find clang \( -name '*.h' -o -name '*.cpp' \) -print0 | xargs -0 perl -0777 -pi -e 's/namespace mlir \{\nnamespace cir \{/namespace cir {/g'
find clang \( -name '*.h' -o -name '*.cpp' \) -print0 | xargs -0 perl -0777 -pi -e 's!\} // namespace cir\n\} // namespace mlir!} // namespace cir!g'
```

It then required some manual fixups to address edge cases.

Code that lived under `mlir::cir` could refer to the `mlir` namespace
without qualification, but after the namespace change, we need to
explicitly qualify all our usages. This is done in the second commit via
https://gist.github.com/smeenai/996200fd45ad123bbf22b412d59479b6, which
is an idempotent script to add all qualifications. I added cases to the
script one at a time and reviewed each change afterwards to ensure we
were only making the intended modifications, so I feel pretty confident
in the end result. I also removed `using namespace llvm` from some
headers to avoid conflicts, which in turn required adding some `llvm::`
qualifiers as well.

The third commit fixes a test, since an error message now contains the
mlir namespace. Similar tests in flang also have the namespace in their
error messages, so this is an expected change.

The fourth change runs `git clang-format`. Unfortunately, that doesn't
work for TableGen files, so we'll have a few instances of undesirable
formatting left there. I'll look into fixing that as a follow-up.

I validated the end result by examining the symbols in the built Clang
binary. There's nothing in the `mlir::cir` namespace anymore.
https://gist.github.com/smeenai/8438fd01588109fcdbde5c8652781dc0 had the
symbols which lived in `cir` and should have moved to `clang::CIRGen`,
and I validated that all the symbols were moved, with the exceptions
noted in #1082 and the duplicated
symbols noted in #1025.

Author: smeenai

clang/include/clang/CIR/ABIArgInfo.h

@@ -167,8 +167,7 @@ class ABIArgInfo {
   }
   static ABIArgInfo getZeroExtend(mlir::Type Ty, mlir::Type T = nullptr) {
     // NOTE(cir): Enumerations are IntTypes in CIR.
-    assert(mlir::isa<mlir::cir::IntType>(Ty) ||
-           mlir::isa<mlir::cir::BoolType>(Ty));
+    assert(mlir::isa<cir::IntType>(Ty) || mlir::isa<cir::BoolType>(Ty));
     auto AI = ABIArgInfo(Extend);
     AI.setCoerceToType(T);
     AI.setPaddingType(nullptr);
@@ -190,9 +189,8 @@ class ABIArgInfo {
     // NOTE(cir): The original can apply this method on both integers and
     // enumerations, but in CIR, these two types are one and the same. Booleans
     // will also fall into this category, but they have their own type.
-    if (mlir::isa<mlir::cir::IntType>(Ty) &&
-        mlir::cast<mlir::cir::IntType>(Ty).isSigned())
-      return getSignExtend(mlir::cast<mlir::cir::IntType>(Ty), T);
+    if (mlir::isa<cir::IntType>(Ty) && mlir::cast<cir::IntType>(Ty).isSigned())
+      return getSignExtend(mlir::cast<cir::IntType>(Ty), T);
     return getZeroExtend(Ty, T);
   }
 

clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h

@@ -35,13 +35,11 @@ class VarDecl;
 class RecordDecl;
 } // namespace clang
 
-namespace mlir {
 namespace cir {
 class ArrayType;
 class StructType;
 class BoolType;
 } // namespace cir
-} // namespace mlir
 
 #define GET_ATTRDEF_CLASSES
 #include "clang/CIR/Dialect/IR/CIROpsAttributes.h.inc"

clang/include/clang/CIR/Dialect/IR/CIRAttrs.h

@@ -53,7 +53,7 @@ class CIRDataLayout {
   /// struct, its size, and the offsets of its fields.
   ///
   /// Note that this information is lazily cached.
-  const StructLayout *getStructLayout(mlir::cir::StructType Ty) const;
+  const StructLayout *getStructLayout(cir::StructType Ty) const;
 
   /// Internal helper method that returns requested alignment for type.
   llvm::Align getAlignment(mlir::Type Ty, bool abiOrPref) const;
@@ -93,17 +93,17 @@ class CIRDataLayout {
   }
 
   llvm::TypeSize getPointerTypeSizeInBits(mlir::Type Ty) const {
-    assert(mlir::isa<mlir::cir::PointerType>(Ty) &&
+    assert(mlir::isa<cir::PointerType>(Ty) &&
            "This should only be called with a pointer type");
     return layout.getTypeSizeInBits(Ty);
   }
 
   llvm::TypeSize getTypeSizeInBits(mlir::Type Ty) const;
 
   mlir::Type getIntPtrType(mlir::Type Ty) const {
-    assert(mlir::isa<mlir::cir::PointerType>(Ty) && "Expected pointer type");
-    auto IntTy = mlir::cir::IntType::get(Ty.getContext(),
-                                         getPointerTypeSizeInBits(Ty), false);
+    assert(mlir::isa<cir::PointerType>(Ty) && "Expected pointer type");
+    auto IntTy =
+        cir::IntType::get(Ty.getContext(), getPointerTypeSizeInBits(Ty), false);
     return IntTy;
   }
 };
@@ -153,7 +153,7 @@ class StructLayout final
 private:
   friend class CIRDataLayout; // Only DataLayout can create this class
 
-  StructLayout(mlir::cir::StructType ST, const CIRDataLayout &DL);
+  StructLayout(cir::StructType ST, const CIRDataLayout &DL);
 
   size_t numTrailingObjects(OverloadToken<llvm::TypeSize>) const {
     return NumElements;

clang/include/clang/CIR/Dialect/IR/CIRAttrs.td

@@ -55,7 +55,7 @@ template <typename ConcreteType>
 class SameFirstOperandAndResultType
     : public TraitBase<ConcreteType, SameFirstOperandAndResultType> {
 public:
-  static LogicalResult verifyTrait(Operation *op) {
+  static llvm::LogicalResult verifyTrait(Operation *op) {
     return impl::verifySameFirstOperandAndResultType(op);
   }
 };
@@ -67,7 +67,7 @@ template <typename ConcreteType>
 class SameSecondOperandAndResultType
     : public TraitBase<ConcreteType, SameSecondOperandAndResultType> {
 public:
-  static LogicalResult verifyTrait(Operation *op) {
+  static llvm::LogicalResult verifyTrait(Operation *op) {
     return impl::verifySameSecondOperandAndResultType(op);
   }
 };
@@ -79,19 +79,19 @@ template <typename ConcreteType>
 class SameFirstSecondOperandAndResultType
     : public TraitBase<ConcreteType, SameFirstSecondOperandAndResultType> {
 public:
-  static LogicalResult verifyTrait(Operation *op) {
+  static llvm::LogicalResult verifyTrait(Operation *op) {
     return impl::verifySameFirstSecondOperandAndResultType(op);
   }
 };
 
 } // namespace OpTrait
 
+} // namespace mlir
+
 namespace cir {
-void buildTerminatedBody(OpBuilder &builder, Location loc);
+void buildTerminatedBody(mlir::OpBuilder &builder, mlir::Location loc);
 } // namespace cir
 
-} // namespace mlir
-
 #define GET_OP_CLASSES
 #include "clang/CIR/Dialect/IR/CIROps.h.inc"
 

clang/include/clang/CIR/Dialect/IR/CIRDataLayout.h

@@ -22,7 +22,7 @@ def CIR_Dialect : Dialect {
   let summary = "A high-level dialect for analyzing and optimizing Clang "
                 "supported languages";
 
-  let cppNamespace = "::mlir::cir";
+  let cppNamespace = "::cir";
 
   let useDefaultAttributePrinterParser = 0;
   let useDefaultTypePrinterParser = 0;
@@ -32,19 +32,19 @@ def CIR_Dialect : Dialect {
   let extraClassDeclaration = [{
 
     // Names of CIR parameter attributes.
-    static StringRef getSExtAttrName() { return "cir.signext"; }
-    static StringRef getZExtAttrName() { return "cir.zeroext"; }
+    static llvm::StringRef getSExtAttrName() { return "cir.signext"; }
+    static llvm::StringRef getZExtAttrName() { return "cir.zeroext"; }
 
     void registerAttributes();
     void registerTypes();
 
-    Type parseType(DialectAsmParser &parser) const override;
-    void printType(Type type, DialectAsmPrinter &printer) const override;
+    mlir::Type parseType(mlir::DialectAsmParser &parser) const override;
+    void printType(mlir::Type type, mlir::DialectAsmPrinter &printer) const override;
 
-    Attribute parseAttribute(DialectAsmParser &parser,
-                             Type type) const override;
+    mlir::Attribute parseAttribute(mlir::DialectAsmParser &parser,
+                             mlir::Type type) const override;
 
-    void printAttribute(Attribute attr, DialectAsmPrinter &os) const override;
+    void printAttribute(mlir::Attribute attr, mlir::DialectAsmPrinter &os) const override;
   }];
 }
 

clang/include/clang/CIR/Dialect/IR/CIRDialect.h

@@ -57,11 +57,11 @@ def OpenCLKernelMetadataAttr
   }];
 
   let parameters = (ins
-    OptionalParameter<"ArrayAttr">:$work_group_size_hint,
-    OptionalParameter<"ArrayAttr">:$reqd_work_group_size,
-    OptionalParameter<"TypeAttr">:$vec_type_hint,
+    OptionalParameter<"mlir::ArrayAttr">:$work_group_size_hint,
+    OptionalParameter<"mlir::ArrayAttr">:$reqd_work_group_size,
+    OptionalParameter<"mlir::TypeAttr">:$vec_type_hint,
     OptionalParameter<"std::optional<bool>">:$vec_type_hint_signedness,
-    OptionalParameter<"IntegerAttr">:$intel_reqd_sub_group_size
+    OptionalParameter<"mlir::IntegerAttr">:$intel_reqd_sub_group_size
   );
 
   let assemblyFormat = "`<` struct(params) `>`";
@@ -76,14 +76,14 @@ def OpenCLKernelMetadataAttr
   let extraClassDefinition = [{
     std::optional<bool> $cppClass::isSignedHint(mlir::Type hintQTy) {
       // Only types in CIR carry signedness
-      if (!mlir::isa<mlir::cir::CIRDialect>(hintQTy.getDialect()))
+      if (!mlir::isa<cir::CIRDialect>(hintQTy.getDialect()))
         return std::nullopt;
 
       // See also clang::CodeGen::CodeGenFunction::EmitKernelMetadata
-      auto hintEltQTy = mlir::dyn_cast<mlir::cir::VectorType>(hintQTy);
+      auto hintEltQTy = mlir::dyn_cast<cir::VectorType>(hintQTy);
       auto isCIRSignedIntType = [](mlir::Type t) {
-        return mlir::isa<mlir::cir::IntType>(t) &&
-               mlir::cast<mlir::cir::IntType>(t).isSigned();
+        return mlir::isa<cir::IntType>(t) &&
+               mlir::cast<cir::IntType>(t).isSigned();
       };
       return isCIRSignedIntType(hintQTy) ||
               (hintEltQTy && isCIRSignedIntType(hintEltQTy.getEltType()));
@@ -134,12 +134,12 @@ def OpenCLKernelArgMetadataAttr
   }];
 
   let parameters = (ins
-    "ArrayAttr":$addr_space,
-    "ArrayAttr":$access_qual,
-    "ArrayAttr":$type,
-    "ArrayAttr":$base_type,
-    "ArrayAttr":$type_qual,
-    OptionalParameter<"ArrayAttr">:$name
+    "mlir::ArrayAttr":$addr_space,
+    "mlir::ArrayAttr":$access_qual,
+    "mlir::ArrayAttr":$type,
+    "mlir::ArrayAttr":$base_type,
+    "mlir::ArrayAttr":$type_qual,
+    OptionalParameter<"mlir::ArrayAttr">:$name
   );
 
   let assemblyFormat = "`<` struct(params) `>`";