[skip ci] Updated tests + labelled passing and failing tests

Author: vfdev-5

mlir/lib/Bindings/Python/IRCore.cpp

@@ -241,9 +241,20 @@ static MlirBlock createBlock(const py::sequence &pyArgTypes,
 
 /// Wrapper for the global LLVM debugging flag.
 struct PyGlobalDebugFlag {
-  static void set(py::object &o, bool enable) { mlirEnableGlobalDebug(enable); }
+  static void set(py::object &o, bool enable) {
+    withLock([&](){
+      mlirEnableGlobalDebug(enable);
+      return 0;
+    });
+  }
 
-  static bool get(const py::object &) { return mlirIsGlobalDebugEnabled(); }
+  static bool get(const py::object &) {
+    // Use lock in free-threading to avoid data-races,
+    // observed in ir/debug.py, testDebugDlag
+    return withLock([&](){
+      return mlirIsGlobalDebugEnabled();
+    });
+  }
 
   static void bind(py::module &m) {
     // Debug flags.
@@ -253,40 +264,72 @@ struct PyGlobalDebugFlag {
         .def_static(
             "set_types",
             [](const std::string &type) {
-              mlirSetGlobalDebugType(type.c_str());
+              withLock([&](){
+                mlirSetGlobalDebugType(type.c_str());
+                return 0;
+              });
             },
             "types"_a, "Sets specific debug types to be produced by LLVM")
         .def_static("set_types", [](const std::vector<std::string> &types) {
           std::vector<const char *> pointers;
           pointers.reserve(types.size());
           for (const std::string &str : types)
             pointers.push_back(str.c_str());
-          mlirSetGlobalDebugTypes(pointers.data(), pointers.size());
+          withLock([&](){
+            mlirSetGlobalDebugTypes(pointers.data(), pointers.size());
+            return 0;
+          });
         });
   }
+
+private:
+#ifdef Py_GIL_DISABLED
+  static PyMutex &getLock() {
+    static PyMutex lock;
+    return lock;
+  }
+#endif
+
+  template<typename F>
+  static inline auto withLock(const F& cb) -> decltype(cb()) {
+#ifdef Py_GIL_DISABLED
+    auto &lock = getLock();
+    PyMutex_Lock(&lock);
+#endif
+    auto result = cb();
+#ifdef Py_GIL_DISABLED
+    PyMutex_Unlock(&lock);
+#endif
+    return result;
+  }
 };
 
 struct PyAttrBuilderMap {
   static bool dunderContains(const std::string &attributeKind) {
     return PyGlobals::get().lookupAttributeBuilder(attributeKind).has_value();
   }
-  static py::function dundeGetItemNamed(const std::string &attributeKind) {
-    auto builder = PyGlobals::get().lookupAttributeBuilder(attributeKind);
+  static py::function dunderGetItemNamed(const std::string &attributeKind) {
+    auto builder = PyGlobals::withInstance([&](PyGlobals& instance) {
+        return instance.lookupAttributeBuilder(attributeKind);
+    });
     if (!builder)
       throw py::key_error(attributeKind);
     return *builder;
   }
-  static void dundeSetItemNamed(const std::string &attributeKind,
+  static void dunderSetItemNamed(const std::string &attributeKind,
                                 py::function func, bool replace) {
-    PyGlobals::get().registerAttributeBuilder(attributeKind, std::move(func),
-                                              replace);
+    PyGlobals::withInstance([&](PyGlobals& instance) {
+        instance.registerAttributeBuilder(attributeKind, std::move(func),
+                                          replace);
+        return 0;
+    });
   }
 
   static void bind(py::module &m) {
     py::class_<PyAttrBuilderMap>(m, "AttrBuilder", py::module_local())
         .def_static("contains", &PyAttrBuilderMap::dunderContains)
-        .def_static("get", &PyAttrBuilderMap::dundeGetItemNamed)
-        .def_static("insert", &PyAttrBuilderMap::dundeSetItemNamed,
+        .def_static("get", &PyAttrBuilderMap::dunderGetItemNamed)
+        .def_static("insert", &PyAttrBuilderMap::dunderSetItemNamed,
                     "attribute_kind"_a, "attr_builder"_a, "replace"_a = false,
                     "Register an attribute builder for building MLIR "
                     "attributes from python values.");

mlir/python/requirements.txt

@@ -3,5 +3,5 @@ numpy>=1.19.5, <=2.1.2
 # pybind11>=2.14.0, <2.15.0
 # Temporarily set pybind11 version to master waiting the next release to 2.13.6
 pybind11 @ git+https://github.com/pybind/pybind11@master
-PyYAML>=5.4.0, <=6.0.1
+PyYAML>=5.4.0, <=6.0.2
 ml_dtypes>=0.5.0, <=0.6.0   # provides several NumPy dtype extensions, including the bf16