Fix Android ARM64 build.

The llvm::StringRef to absl::string_view converter is not (always?) available on Android, so inserting StringRef::str() calls where necessary. PiperOrigin-RevId: 730557466
openxla · Feb 24, 2025 · 4d7a023 · 4d7a023
1 parent edb8f0e
commit 4d7a023
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/xla/service/spmd/shardy/round_trip_common/import_backend_func_calls.cc b/xla/service/spmd/shardy/round_trip_common/import_backend_func_calls.cc
@@ -71,8 +71,7 @@ class BackendFuncCallPattern : public OpConversionPattern<CallOp> {
     }
 
     FuncOp func = symbolTable.lookup<FuncOp>(adaptor.getCallee());
-    CHECK(func) << "Failed to lookup function: "
-                << absl::string_view(adaptor.getCallee());
+    CHECK(func) << "Failed to lookup function: " << adaptor.getCallee().str();
     mlir::SmallVector<mlir::NamedAttribute> namedCompAttrs;
     llvm::copy_if(callOp->getDiscardableAttrs(),
                   std::back_inserter(namedCompAttrs),

diff --git a/xla/service/spmd/shardy/round_trip_common/import_sdy_custom_calls.cc b/xla/service/spmd/shardy/round_trip_common/import_sdy_custom_calls.cc
@@ -61,7 +61,7 @@ mlir::LogicalResult rewriteShardingCustomCall(
   std::vector<int64_t> unspecDims;
   if (std::optional<mlir::Attribute> backendConfig = op.getBackendConfig()) {
     CHECK_OK(xla::sharding_op_util::ParseAttributes(
-        mlir::dyn_cast<mlir::StringAttr>(*backendConfig).getValue(),
+        mlir::dyn_cast<mlir::StringAttr>(*backendConfig).getValue().str(),
         &unspecDims));
   }
 

diff --git a/xla/service/spmd/shardy/sdy_round_trip/remove_size_one_axes.cc b/xla/service/spmd/shardy/sdy_round_trip/remove_size_one_axes.cc
@@ -75,7 +75,7 @@ MeshAttr removeSizeOneAxes(MeshAttr mesh) {
 TensorShardingAttr removeSizeOneAxes(TensorShardingAttr sharding,
                                      const SymbolTable& symbolTable) {
   MeshAttr mesh = sharding.getMesh(symbolTable);
-  CHECK(mesh) << "unknown mesh: " << absl::string_view(sharding.getMeshName());
+  CHECK(mesh) << "unknown mesh: " << sharding.getMeshName().str();
 
   auto isNotSizeOne = [&](AxisRefAttr axis) { return axis.getSize(mesh) != 1; };
 

diff --git a/xla/service/spmd/shardy/sdy_round_trip/shard_map_import.cc b/xla/service/spmd/shardy/sdy_round_trip/shard_map_import.cc
@@ -77,8 +77,8 @@ class ManualComputationPattern : public OpConversionPattern<CallOp> {
   mlir::LogicalResult matchAndRewrite(
       CallOp callOp, OpAdaptor adaptor,
       mlir::ConversionPatternRewriter& rewriter) const override {
-    if (!absl::StrContains(callOp.getCallee(),
-                           kManualComputationBodyFuncName)) {
+    if (!absl::StrContains(callOp.getCallee().str(),
+                           kManualComputationBodyFuncName.str())) {
       return mlir::failure();
     }
 
@@ -159,7 +159,8 @@ class SdyRoundTripShardMapImportPass
     MLIRContext& context = getContext();
     mlir::ConversionTarget target(context);
     target.addDynamicallyLegalOp<CallOp>([](CallOp op) {
-      return !absl::StrContains(op.getCallee(), kManualComputationBodyFuncName);
+      return !absl::StrContains(op.getCallee().str(),
+                                kManualComputationBodyFuncName.str());
     });
     target.addLegalOp<sdy::ManualComputationOp, sdy::ReturnOp, CustomCallOp>();
     mlir::RewritePatternSet patterns(&context);

diff --git a/xla/service/spmd/shardy/utils.h b/xla/service/spmd/shardy/utils.h
@@ -82,8 +82,9 @@ AttrTy parseStringAttr(mlir::DictionaryAttr dictAttr,
   if (mlir::Attribute stringAttr = dictAttr.get(attrName)) {
     std::string value;
     std::string error;
-    CHECK(absl::CUnescape(mlir::cast<mlir::StringAttr>(stringAttr).getValue(),
-                          &value, &error))
+    CHECK(absl::CUnescape(
+        mlir::cast<mlir::StringAttr>(stringAttr).getValue().str(), &value,
+        &error))
         << error;
     return mlir::cast<AttrTy>(
         mlir::parseAttribute(value, stringAttr.getContext()));