remove valuecastercache

Author: makslevental

mlir/lib/Bindings/Python/Globals.h

@@ -120,12 +120,8 @@ class PyGlobals {
   llvm::StringMap<pybind11::object> attributeBuilderMap;
   /// Map of MlirTypeID to custom type caster.
   llvm::DenseMap<MlirTypeID, pybind11::object> typeCasterMap;
-
   /// Map of MlirTypeID to custom value caster.
   llvm::DenseMap<MlirTypeID, pybind11::object> valueCasterMap;
-  /// Cache for map of MlirTypeID to custom value caster.
-  llvm::DenseMap<MlirTypeID, pybind11::object> valueCasterMapCache;
-
   /// Set of dialect namespaces that we have attempted to import implementation
   /// modules for.
   llvm::StringSet<> loadedDialectModules;

mlir/lib/Bindings/Python/IRModule.cpp

@@ -92,14 +92,10 @@ void PyGlobals::registerValueCaster(MlirTypeID mlirTypeID,
                                     pybind11::function valueCaster,
                                     bool replace) {
   pybind11::object &found = valueCasterMap[mlirTypeID];
-  if (found && !found.is_none() && !replace)
+  if (found && !replace)
     throw std::runtime_error("Value caster is already registered: " +
                              py::repr(found).cast<std::string>());
   found = std::move(valueCaster);
-  const auto foundIt = valueCasterMapCache.find(mlirTypeID);
-  if (foundIt != valueCasterMapCache.end() && !foundIt->second.is_none()) {
-    valueCasterMapCache[mlirTypeID] = found;
-  }
 }
 
 void PyGlobals::registerDialectImpl(const std::string &dialectNamespace,
@@ -150,35 +146,13 @@ std::optional<py::function> PyGlobals::lookupTypeCaster(MlirTypeID mlirTypeID,
 
 std::optional<py::function> PyGlobals::lookupValueCaster(MlirTypeID mlirTypeID,
                                                          MlirDialect dialect) {
-  {
-    // Fast match against the value caster map first (common case).
-    const auto foundIt = valueCasterMapCache.find(mlirTypeID);
-    if (foundIt != valueCasterMapCache.end()) {
-      if (foundIt->second.is_none())
-        return std::nullopt;
-      assert(foundIt->second && "py::function is defined");
-      return foundIt->second;
-    }
-  }
-
-  // Not found. Load the dialect namespace.
   loadDialectModule(unwrap(mlirDialectGetNamespace(dialect)));
-
-  // Attempt to find from the canonical map and cache.
-  {
-    const auto foundIt = valueCasterMap.find(mlirTypeID);
-    if (foundIt != valueCasterMap.end()) {
-      if (foundIt->second.is_none())
-        return std::nullopt;
-      assert(foundIt->second && "py::object is defined");
-      // Positive cache.
-      valueCasterMapCache[mlirTypeID] = foundIt->second;
-      return foundIt->second;
-    }
-    // Negative cache.
-    valueCasterMap[mlirTypeID] = py::none();
-    return std::nullopt;
+  const auto foundIt = valueCasterMap.find(mlirTypeID);
+  if (foundIt != valueCasterMap.end()) {
+    assert(foundIt->second && "value caster is defined");
+    return foundIt->second;
   }
+  return std::nullopt;
 }
 
 std::optional<py::object>