[mlir][sparse] SparseTensorUtils post-refactoring cleanup

This differential corrects a few minor rebasing errors from the recent slew of differentials for factoring out the mlir_sparsetensor_utils library.

Reviewed By: aartbik, Peiming

Differential Revision: https://reviews.llvm.org/D134985

diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h b/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h
index d074f43..72ae4de 100644 (file)
--- a/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h
+++ b/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h
@@ -18,7 +18,6 @@
 #include "mlir/Dialect/SparseTensor/IR/SparseTensor.h"
 #include "mlir/Dialect/Utils/ReshapeOpsUtils.h"
 #include "mlir/ExecutionEngine/SparseTensor/Enums.h"
-#include "mlir/ExecutionEngine/SparseTensorUtils.h"
 #include "mlir/IR/Builders.h"
 
 namespace mlir {

diff --git a/mlir/lib/ExecutionEngine/SparseTensor/File.cpp b/mlir/lib/ExecutionEngine/SparseTensor/File.cpp
index dfe3e55..3e8c3e0 100644 (file)
--- a/mlir/lib/ExecutionEngine/SparseTensor/File.cpp
+++ b/mlir/lib/ExecutionEngine/SparseTensor/File.cpp
@@ -114,10 +114,9 @@ bool SparseTensorFile::canReadAs(PrimaryType valTy) const {
 }
 
 /// Helper to convert C-style strings (i.e., '\0' terminated) to lower case.
-static inline char *toLower(char *token) {
+static inline void toLower(char *token) {
   for (char *c = token; *c; ++c)
     *c = tolower(*c);
-  return token;
 }
 
 /// Idiomatic name for checking string equality.

diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index e24aa09..d68fc2b 100644 (file)
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -2091,7 +2091,6 @@ cc_library(
         ":TensorDialect",
         ":Transforms",
         ":VectorDialect",
-        ":_mlir_c_runner_utils",
         ":mlir_sparse_tensor_utils",
         "//llvm:Support",
     ],