Handle hybrid AS approach with GlobalOps

Author: RiverDave

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

@@ -106,6 +106,7 @@ def CIR_AnyAddressSpaceAttr : AnyAttrOf<[
   CIR_TargetAddressSpaceAttrConstraint
 ]> {
   string cppType = "::mlir::Attribute";
+  let constBuilderCall = "nullptr";
 }
 
 #endif // CLANG_CIR_DIALECT_IR_CIRATTRCONSTRAINTS_TD

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

@@ -2617,8 +2617,8 @@ def CIR_GlobalOp : CIR_Op<"global", [
     TypeAttr:$sym_type,
     CIR_GlobalLinkageKind:$linkage,
     DefaultValuedAttr<
-      CIR_AddressSpaceAttr,
-      "AddressSpace::Default"
+      CIR_AnyAddressSpaceAttr,
+      "{}"
     >:$addr_space,
     OptionalAttr<CIR_TLSModel>:$tls_model,
     // Note this can also be a FlatSymbolRefAttr
@@ -2642,7 +2642,7 @@ def CIR_GlobalOp : CIR_Op<"global", [
        (`comdat` $comdat^)?
        ($tls_model^)?
        (`dso_local` $dso_local^)?
-       (`addrspace` `` $addr_space^)?
+       ( `,` ` ` custom<AddressSpaceValue>($addr_space)^ )?
        $sym_name
        custom<GlobalOpTypeAndInitialValue>($sym_type, $initial_value, $ctorRegion, $dtorRegion)
        ($annotations^)?

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -1112,9 +1112,9 @@ CIRGenModule::getOrCreateCIRGlobal(StringRef mangledName, mlir::Type ty,
     entry = dyn_cast_or_null<cir::GlobalOp>(v);
   }
 
-  cir::AddressSpace cirAS = cir::toCIRAddressSpace(langAS);
+  mlir::Attribute cirAS = cir::toCIRAddressSpaceAttr(&getMLIRContext(), langAS);
   if (entry) {
-    cir::AddressSpace entryCIRAS = entry.getAddrSpace();
+    mlir::Attribute entryCIRAS = entry.getAddrSpace();
     if (WeakRefReferences.erase(entry)) {
       if (d && !d->hasAttr<WeakAttr>()) {
         auto lt = cir::GlobalLinkageKind::ExternalLinkage;

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

@@ -28,6 +28,7 @@
 
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMTypes.h"
+#include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/BuiltinTypes.h"
@@ -55,6 +56,8 @@ using namespace mlir;
 #include "clang/CIR/Interfaces/ASTAttrInterfaces.h"
 #include "clang/CIR/Interfaces/CIROpInterfaces.h"
 #include <clang/CIR/MissingFeatures.h>
+#include <clang/CIR/Dialect/IR/CIRTypes.h>
+#include <clang/CIR/Dialect/IR/CIRDialect.h>
 
 //===----------------------------------------------------------------------===//
 // CIR Dialect
@@ -304,6 +307,12 @@ static void printOmittedTerminatorRegion(mlir::OpAsmPrinter &printer,
   }
 }
 
+mlir::ParseResult parseAddressSpaceValue(mlir::AsmParser &p,
+                                         mlir::Attribute &attr);
+
+void printAddressSpaceValue(mlir::AsmPrinter &printer, cir::GlobalOp op,
+                            mlir::Attribute attr);
+
 //===----------------------------------------------------------------------===//
 // AllocaOp
 //===----------------------------------------------------------------------===//
@@ -2481,17 +2490,7 @@ cir::GetGlobalOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
   if (auto g = dyn_cast<GlobalOp>(op)) {
     symTy = g.getSymType();
     // Convert enum to attribute for comparison
-    cir::AddressSpace symAddrSpace = g.getAddrSpace();
-    if (symAddrSpace == cir::AddressSpace::Default) {
-      symAddrSpaceAttr = {};
-    } else if (cir::isTargetAddressSpace(symAddrSpace)) {
-      unsigned targetAS =
-          cir::getTargetAddressSpaceValueFromCIRAS(symAddrSpace);
-      symAddrSpaceAttr =
-          cir::TargetAddressSpaceAttr::get(getContext(), targetAS);
-    } else {
-      symAddrSpaceAttr = cir::AddressSpaceAttr::get(getContext(), symAddrSpace);
-    }
+    symAddrSpaceAttr = g.getAddrSpace();
     // Verify that for thread local global access, the global needs to
     // be marked with tls bits.
     if (getTls() && !g.getTlsModel())

clang/lib/CIR/Dialect/IR/CIRTypes.cpp

@@ -1027,6 +1027,11 @@ void printAddressSpaceValue(mlir::AsmPrinter &p, mlir::Attribute attr) {
   llvm_unreachable("unexpected address-space attribute kind");
 }
 
+void printAddressSpaceValue(mlir::AsmPrinter &printer, cir::GlobalOp,
+                            mlir::Attribute attr) {
+  printAddressSpaceValue(printer, attr);
+}
+
 mlir::Attribute cir::toCIRAddressSpaceAttr(mlir::MLIRContext *ctx,
                                            clang::LangAS langAS) {
   using clang::LangAS;