✨ [NA] Add IDS Placement Method

CHANGELOG.md

@@ -13,6 +13,7 @@ _If you are upgrading: please see [`UPGRADING.md`](UPGRADING.md#unreleased)._
 
 ### Added
 
+- ✨ Add iterative diving search as a more efficient placement heuristic method ([#862]) ([**@ystade**])
 - ✨ Add relaxed routing method to the zoned neutral atom compiler ([#859]) ([**@ystade**])
 
 ### Changed
@@ -173,6 +174,7 @@ _📚 Refer to the [GitHub Release Notes] for previous changelogs._
 <!-- PR links -->
 
 [#874]: https://github.com/munich-quantum-toolkit/qmap/pull/874
+[#862]: https://github.com/munich-quantum-toolkit/qmap/pull/862
 [#859]: https://github.com/munich-quantum-toolkit/qmap/pull/859
 [#848]: https://github.com/munich-quantum-toolkit/qmap/pull/848
 [#847]: https://github.com/munich-quantum-toolkit/qmap/pull/847

bindings/na/zoned/zoned.cpp

@@ -13,7 +13,7 @@
 #include "na/zoned/Compiler.hpp"
 #include "na/zoned/code_generator/CodeGenerator.hpp"
 #include "na/zoned/layout_synthesizer/PlaceAndRouteSynthesizer.hpp"
-#include "na/zoned/layout_synthesizer/placer/AStarPlacer.hpp"
+#include "na/zoned/layout_synthesizer/placer/HeuristicPlacer.hpp"
 #include "na/zoned/layout_synthesizer/placer/VertexMatchingPlacer.hpp"
 #include "na/zoned/layout_synthesizer/router/IndependentSetRouter.hpp"
 
@@ -53,6 +53,16 @@ PYBIND11_MODULE(MQT_QMAP_MODULE_NAME, m, py::mod_gil_not_used()) {
                      return self.exportNAVizMachine();
                    });
 
+  //===--------------------------------------------------------------------===//
+  // Placement Method Enum
+  //===--------------------------------------------------------------------===//
+  py::native_enum<na::zoned::HeuristicPlacer::Config::Method>(
+      m, "PlacementMethod", "enum.Enum")
+      .value("astar", na::zoned::HeuristicPlacer::Config::Method::ASTAR)
+      .value("ids", na::zoned::HeuristicPlacer::Config::Method::IDS)
+      .export_values()
+      .finalize();
+
   //===--------------------------------------------------------------------===//
   // Routing Method Enum
   //===--------------------------------------------------------------------===//
@@ -140,37 +150,44 @@ PYBIND11_MODULE(MQT_QMAP_MODULE_NAME, m, py::mod_gil_not_used()) {
   {
     const na::zoned::RoutingAwareCompiler::Config defaultConfig;
     routingAwareCompiler.def(
-        py::init([](const na::zoned::Architecture& arch,
-                    const std::string& logLevel, const double maxFillingFactor,
-                    const bool useWindow, const size_t windowMinWidth,
-                    const double windowRatio, const double windowShare,
-                    const float deepeningFactor, const float deepeningValue,
-                    const float lookaheadFactor, const float reuseLevel,
-                    const size_t maxNodes,
-                    const na::zoned::IndependentSetRouter::Config::Method
-                        routingMethod,
-                    const double preferSplit, const bool warnUnsupportedGates)
-                     -> na::zoned::RoutingAwareCompiler {
-          na::zoned::RoutingAwareCompiler::Config config;
-          config.logLevel = spdlog::level::from_str(logLevel);
-          config.schedulerConfig.maxFillingFactor = maxFillingFactor;
-          config.layoutSynthesizerConfig.placerConfig = {
-              .useWindow = useWindow,
-              .windowMinWidth = windowMinWidth,
-              .windowRatio = windowRatio,
-              .windowShare = windowShare,
-              .deepeningFactor = deepeningFactor,
-              .deepeningValue = deepeningValue,
-              .lookaheadFactor = lookaheadFactor,
-              .reuseLevel = reuseLevel,
-              .maxNodes = maxNodes,
-          };
-          config.layoutSynthesizerConfig.routerConfig = {
-              .method = routingMethod, .preferSplit = preferSplit};
-          config.codeGeneratorConfig = {.warnUnsupportedGates =
-                                            warnUnsupportedGates};
-          return {arch, config};
-        }),
+        py::init(
+            [](const na::zoned::Architecture& arch, const std::string& logLevel,
+               const double maxFillingFactor, const bool useWindow,
+               const size_t windowMinWidth, const double windowRatio,
+               const double windowShare,
+               const na::zoned::HeuristicPlacer::Config::Method placementMethod,
+               const float deepeningFactor, const float deepeningValue,
+               const float lookaheadFactor, const float reuseLevel,
+               const size_t maxNodes, const size_t trials,
+               const size_t queueCapacity,
+               const na::zoned::IndependentSetRouter::Config::Method
+                   routingMethod,
+               const double preferSplit, const bool warnUnsupportedGates)
+                -> na::zoned::RoutingAwareCompiler {
+              na::zoned::RoutingAwareCompiler::Config config;
+              config.logLevel = spdlog::level::from_str(logLevel);
+              config.schedulerConfig.maxFillingFactor = maxFillingFactor;
+
+              config.layoutSynthesizerConfig.placerConfig = {
+                  .useWindow = useWindow,
+                  .windowMinWidth = windowMinWidth,
+                  .windowRatio = windowRatio,
+                  .windowShare = windowShare,
+                  .method = placementMethod,
+                  .deepeningFactor = deepeningFactor,
+                  .deepeningValue = deepeningValue,
+                  .lookaheadFactor = lookaheadFactor,
+                  .reuseLevel = reuseLevel,
+                  .maxNodes = maxNodes,
+                  .trials = trials,
+                  .queueCapacity = queueCapacity,
+              };
+              config.layoutSynthesizerConfig.routerConfig = {
+                  .method = routingMethod, .preferSplit = preferSplit};
+              config.codeGeneratorConfig = {.warnUnsupportedGates =
+                                                warnUnsupportedGates};
+              return {arch, config};
+            }),
         py::keep_alive<1, 2>(), "arch"_a,
         "log_level"_a = spdlog::level::to_short_c_str(defaultConfig.logLevel),
         "max_filling_factor"_a = defaultConfig.schedulerConfig.maxFillingFactor,
@@ -182,6 +199,8 @@ PYBIND11_MODULE(MQT_QMAP_MODULE_NAME, m, py::mod_gil_not_used()) {
             defaultConfig.layoutSynthesizerConfig.placerConfig.windowRatio,
         "window_share"_a =
             defaultConfig.layoutSynthesizerConfig.placerConfig.windowShare,
+        "placement_method"_a =
+            defaultConfig.layoutSynthesizerConfig.placerConfig.method,
         "deepening_factor"_a =
             defaultConfig.layoutSynthesizerConfig.placerConfig.deepeningFactor,
         "deepening_value"_a =
@@ -192,6 +211,9 @@ PYBIND11_MODULE(MQT_QMAP_MODULE_NAME, m, py::mod_gil_not_used()) {
             defaultConfig.layoutSynthesizerConfig.placerConfig.reuseLevel,
         "max_nodes"_a =
             defaultConfig.layoutSynthesizerConfig.placerConfig.maxNodes,
+        "trials"_a = defaultConfig.layoutSynthesizerConfig.placerConfig.trials,
+        "queue_capacity"_a =
+            defaultConfig.layoutSynthesizerConfig.placerConfig.queueCapacity,
         "routing_method"_a =
             defaultConfig.layoutSynthesizerConfig.routerConfig.method,
         "prefer_split"_a =

include/na/zoned/Compiler.hpp

@@ -15,7 +15,7 @@
 #include "ir/QuantumComputation.hpp"
 #include "ir/operations/Operation.hpp"
 #include "layout_synthesizer/PlaceAndRouteSynthesizer.hpp"
-#include "layout_synthesizer/placer/AStarPlacer.hpp"
+#include "layout_synthesizer/placer/HeuristicPlacer.hpp"
 #include "layout_synthesizer/placer/VertexMatchingPlacer.hpp"
 #include "layout_synthesizer/router/IndependentSetRouter.hpp"
 #include "na/NAComputation.hpp"
@@ -269,7 +269,7 @@ class RoutingAgnosticCompiler final
 };
 
 class RoutingAwareSynthesizer
-    : public PlaceAndRouteSynthesizer<RoutingAwareSynthesizer, AStarPlacer,
+    : public PlaceAndRouteSynthesizer<RoutingAwareSynthesizer, HeuristicPlacer,
                                       IndependentSetRouter> {
 public:
   RoutingAwareSynthesizer(const Architecture& architecture,