Use isa for dialect matching instead of string comparison (#2757)

Author: GleasonK

stablehlo/conversions/linalg/transforms/LegalizeToLinalgUtils.cpp

@@ -178,8 +178,7 @@ bool allOperandsAreScalarTensors(Operation *op) {
 
 bool isInBodyOfLinalgOps(Operation *op) {
   auto *parentOp = op->getParentRegion()->getParentOp();
-  return parentOp->getDialect() ==
-         parentOp->getContext()->getLoadedDialect<linalg::LinalgDialect>();
+  return llvm::isa<linalg::LinalgDialect>(parentOp->getDialect());
 }
 
 SmallVector<int64_t> extract1DVector(DenseIntElementsAttr elements) {

stablehlo/dialect/VhloOps.cpp

@@ -52,7 +52,7 @@ namespace {
 // Helper functions for VHLO verifiers
 template <typename TypeOrAttr>
 bool isFromVhlo(TypeOrAttr t) {
-  return t.getDialect().getNamespace() == VhloDialect::getDialectNamespace();
+  return llvm::isa<VhloDialect>(t.getDialect());
 }
 
 template <typename TypeOrAttr>

stablehlo/dialect/VhloTypes.cpp

@@ -326,6 +326,7 @@ namespace {
 // Helper functions for VHLO verifiers
 template <typename TypeOrAttr>
 bool isFromVhlo(TypeOrAttr t) {
+  // Requires string comparison to avoid cyclic dependency with VhloOps.h.
   return t.getDialect().getNamespace() == "vhlo";
 }
 

stablehlo/transforms/StablehloLegalizeToVhlo.cpp

@@ -55,10 +55,8 @@ class StablehloToVhloTypeConverter : public vhlo::VhloTypeConverter {
  public:
   StablehloToVhloTypeConverter() : vhlo::VhloTypeConverter() {
     addConversion([](Type type) -> Type {
-      if (type.getDialect().getNamespace() ==
-          vhlo::VhloDialect::getDialectNamespace()) {
-        return type;
-      }
+      if (llvm::isa<vhlo::VhloDialect>(type.getDialect())) return type;
+
       LLVM_DEBUG(llvm::dbgs() << "Invalid type: " << type << '\n');
       return {};
     });
@@ -71,9 +69,7 @@ class StablehloToVhloTypeConverter : public vhlo::VhloTypeConverter {
   Attribute convertEncoding(Attribute attr) const final {
     LLVM_DEBUG(llvm::dbgs() << "Converting encoding.\n" << attr << '\n');
     // Must be VHLO encoding, or convertible to VHLO encoding.
-    if (attr.getDialect().getNamespace() ==
-        vhlo::VhloDialect::getDialectNamespace())
-      return attr;
+    if (llvm::isa<vhlo::VhloDialect>(attr.getDialect())) return attr;
 
     if (auto stablehloAttr =
             dyn_cast_or_null<stablehlo::TypeExtensionsAttr>(attr)) {
@@ -141,8 +137,7 @@ Attribute convertGeneric(Attribute stablehloAttr,
                                            attr.getRtol(), attr.getUlps(),
                                            modeAttr);
   }
-  if (stablehloAttr.getDialect().getNamespace() ==
-      stablehlo::StablehloDialect::getDialectNamespace()) {
+  if (llvm::isa<stablehlo::StablehloDialect>(stablehloAttr.getDialect())) {
     // All StableHLO attributes must have counterparts in VHLO.
     return {};
   }

stablehlo/transforms/VhloLegalizeToStablehlo.cpp

@@ -183,8 +183,7 @@ Attribute convertGeneric(Attribute vhloAttr,
   }
 
   // All VHLO Attributes must be converted by now.
-  if (vhloAttr.getDialect().getNamespace() ==
-      vhlo::VhloDialect::getDialectNamespace()) {
+  if (llvm::isa<vhlo::VhloDialect>(vhloAttr.getDialect())) {
     // All VHLO attributes must have counterparts in StableHLO.
     return {};
   }

stablehlo/transforms/VhloToVersion.cpp

@@ -60,9 +60,7 @@ class VhloToVersionConverter : public TypeConverter {
  public:
   VhloToVersionConverter() : TypeConverter() {
     addConversion([](Type type) -> Type {
-      if (type.getDialect().getNamespace() ==
-          vhlo::VhloDialect::getDialectNamespace())
-        return type;
+      if (llvm::isa<vhlo::VhloDialect>(type.getDialect())) return type;
       LLVM_DEBUG(llvm::dbgs() << "Invalid type: " << type << '\n');
       return {};
     });