Address review comments.

Simplify design:
  - Remove dialect initialization and necessary mechanism.

Author: mshahneo

mlir/include/mlir/Dialect/XeGPU/uArch/uArchBase.h

@@ -199,51 +199,6 @@ struct SharedMemory {
   // @TODO: Add more fields as needed (e.g., latency, throughput, bandwidth)
 };
 
-struct uArchMap {
-public:
-  // Singleton instance
-  static uArchMap &instance() {
-    static uArchMap instance;
-    return instance;
-  }
-
-  // Insert or update a key-value pair
-  void insert(const std::string &key, std::shared_ptr<uArch> value) {
-    std::unique_lock<std::shared_mutex> lock(mutex_);
-    // map_[key] = std::move(value); // safe to overwrite
-    map_.emplace(key, std::move(value)); // safe to overwrite
-  }
-
-  // Get a value by key (concurrent safe read)
-  std::shared_ptr<uArch> get(const std::string &key) const {
-    std::shared_lock<std::shared_mutex> lock(mutex_);
-    auto it = map_.find(key);
-    if (it != map_.end())
-      return it->second;
-    return nullptr;
-  }
-
-  // Check if a key exists
-  bool contains(const std::string &key) const {
-    std::shared_lock<std::shared_mutex> lock(mutex_);
-    return map_.find(key) != map_.end();
-  }
-
-  // Remove a key
-  bool erase(const std::string &key) {
-    std::unique_lock<std::shared_mutex> lock(mutex_);
-    return map_.erase(key) > 0;
-  }
-
-private:
-  uArchMap() = default;
-  uArchMap(const uArchMap &) = delete;
-  uArchMap &operator=(const uArchMap &) = delete;
-
-  mutable std::shared_mutex mutex_;
-  std::map<std::string, std::shared_ptr<uArch>> map_;
-};
-
 } // namespace uArch
 } // namespace xegpu
 } // namespace mlir

mlir/lib/Dialect/LLVMIR/IR/XeVMDialect.cpp

@@ -346,14 +346,6 @@ XeVMTargetAttr::verify(function_ref<InFlightDiagnostic()> emitError, int O,
 }
 
 void XeVMDialect::initialize() {
-  // Populate the uArchMap with the supported target devices
-  auto pvcuArch =
-      std::make_shared<mlir::xegpu::uArch::Xe2Plus::PVCuArch::PVCuArch>();
-  mlir::xegpu::uArch::uArchMap::instance().insert("pvc", pvcuArch);
-  auto bmguArch =
-      std::make_shared<mlir::xegpu::uArch::Xe2Plus::BMGuArch::BMGuArch>();
-  mlir::xegpu::uArch::uArchMap::instance().insert("bmg", bmguArch);
-
   addOperations<
 #define GET_OP_LIST
 #include "mlir/Dialect/LLVMIR/XeVMOps.cpp.inc"

mlir/lib/Dialect/XeGPU/IR/XeGPUDialect.cpp

@@ -36,14 +36,6 @@ void XeGPUDialect::initialize() {
 #define GET_ATTRDEF_LIST
 #include <mlir/Dialect/XeGPU/IR/XeGPUAttrs.cpp.inc>
       >();
-
-  // Populate the uArchMap with the supported target devices
-  auto pvcuArch =
-      std::make_shared<mlir::xegpu::uArch::Xe2Plus::PVCuArch::PVCuArch>();
-  mlir::xegpu::uArch::uArchMap::instance().insert("pvc", pvcuArch);
-  auto bmguArch =
-      std::make_shared<mlir::xegpu::uArch::Xe2Plus::BMGuArch::BMGuArch>();
-  mlir::xegpu::uArch::uArchMap::instance().insert("bmg", bmguArch);
 }
 
 /// Generates instructions to compute offsets for a subgroup identified by