Extend CustomCallOp backend_config to take a DictionaryAttr

stablehlo/dialect/StablehloOps.cpp

@@ -508,7 +508,8 @@ void CustomCallOp::getEffects(
 }
 
 mlir::Attribute CustomCallOp::getBackendConfigOrDefault() {
-  if (getBackendConfig().has_value()) return getBackendConfig().value();
+  auto backendConfig = getBackendConfig();
+  if (backendConfig.has_value()) return backendConfig.value();
 
   if (getApiVersion() ==
       mlir::stablehlo::CustomCallApiVersion::API_VERSION_TYPED_FFI)

stablehlo/dialect/Version.h

@@ -38,7 +38,7 @@ class Version {
   static FailureOr<Version> fromString(llvm::StringRef versionRef);
 
   /// Return a Version representing the current VHLO dialect version.
-  static Version getCurrentVersion() { return Version(1, 2, 1); }
+  static Version getCurrentVersion() { return Version(1, 3, 0); }
 
   /// Return a Version representing the minimum supported VHLO dialect version.
   static Version getMinimumVersion() { return Version(0, 9, 0); }

stablehlo/dialect/VhloDialect.td

@@ -40,6 +40,7 @@ def VHLO_Dialect : Dialect {
       0.20.0: Remove `padding` attribute from `dynamic_conv`.
       1.0.0: Increase compatibility guarantees to 5 years backward, 2 years forward (no functional changes relative to 0.20.0).
       1.2.0: Introduce `si2` and `ui2` types.
+      1.3.0: Extend `custom_call` op `backend_config` to support `DictionaryAttr`
   }];
 
   let useDefaultAttributePrinterParser = 0;

stablehlo/dialect/VhloEnums.td

@@ -93,17 +93,18 @@ def VHLO_ComparisonTypeAttrV1
 // CustomCallApiVersion
 //===----------------------------------------------------------------------===//
 
-// TODO(#1187): CustomCallApiVersion is not part of the StableHLO spec.
 def VHLO_CUSTOM_CALL_API_VERSION_V1_UNSPECIFIED : I32EnumAttrCase<"API_VERSION_UNSPECIFIED", 0>;
 def VHLO_CUSTOM_CALL_API_VERSION_V1_ORIGINAL : I32EnumAttrCase<"API_VERSION_ORIGINAL", 1>;
 def VHLO_CUSTOM_CALL_API_VERSION_V1_STATUS_RETURNING : I32EnumAttrCase<"API_VERSION_STATUS_RETURNING", 2>;
 def VHLO_CUSTOM_CALL_API_VERSION_V1_STATUS_RETURNING_UNIFIED : I32EnumAttrCase<"API_VERSION_STATUS_RETURNING_UNIFIED", 3>;
+def VHLO_CUSTOM_CALL_API_VERSION_V1_TYPED_FFI : I32EnumAttrCase<"API_VERSION_TYPED_FFI", 4>;
 
 def VHLO_CustomCallApiVersionV1 : VHLO_I32EnumAttr<"CustomCallApiVersionV1", [
     VHLO_CUSTOM_CALL_API_VERSION_V1_UNSPECIFIED,
     VHLO_CUSTOM_CALL_API_VERSION_V1_ORIGINAL,
     VHLO_CUSTOM_CALL_API_VERSION_V1_STATUS_RETURNING,
-    VHLO_CUSTOM_CALL_API_VERSION_V1_STATUS_RETURNING_UNIFIED
+    VHLO_CUSTOM_CALL_API_VERSION_V1_STATUS_RETURNING_UNIFIED,
+    VHLO_CUSTOM_CALL_API_VERSION_V1_TYPED_FFI
 ]> {}
 
 def VHLO_CustomCallApiVersionAttrV1

stablehlo/dialect/VhloOps.cpp

@@ -334,13 +334,15 @@ LogicalResult verifyConstraint_0_17_0(mlir::Operation* op,
   return success();
 }
 
-LogicalResult verifyConstraint_1_1_0(mlir::Operation* op,
+LogicalResult verifyConstraint_1_3_0(mlir::Operation* op,
                                      Version targetVersion) {
-  auto customCallOp = dyn_cast<mlir::vhlo::CustomCallOpV1>(op);
-  if (customCallOp &&
-      isa<mlir::DictionaryAttr>(customCallOp.getBackendConfig()) &&
-      targetVersion < Version(1, 1, 0))
+  auto customCallOp = cast<mlir::vhlo::CustomCallOpV1>(op);
+  if (targetVersion < Version(1, 3, 0) &&
+      (isa<vhlo::DictionaryV1Attr>(customCallOp.getBackendConfig()) ||
+       mlir::cast<CustomCallApiVersionV1Attr>(customCallOp.getApiVersion())
+               .getValue() == CustomCallApiVersionV1::API_VERSION_TYPED_FFI)) {
     return failure();
+  }
   return success();
 }
 
@@ -378,7 +380,7 @@ LogicalResult SelectAndScatterOpV1::validateConstraint(mlir::Operation* op,
 
 LogicalResult CustomCallOpV1::validateConstraint(mlir::Operation* op,
                                                  Version targetVersion) {
-  return verifyConstraint_1_1_0(op, targetVersion);
+  return verifyConstraint_1_3_0(op, targetVersion);
 }
 
 }  // namespace vhlo