From e728763c70c0897249c49fdc84a1c93eff6022c5 Mon Sep 17 00:00:00 2001
From: Max Wipfli <mwipfli@ethz.ch>
Date: Tue, 7 Jul 2026 21:37:18 +0200
Subject: [PATCH] [Handshake] Increase LSQ load/store queue sizes if necessary
 to hold largest group

---
 lib/Dialect/Handshake/MemoryInterfaces.cpp | 43 +++++++++++++++-------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/lib/Dialect/Handshake/MemoryInterfaces.cpp b/lib/Dialect/Handshake/MemoryInterfaces.cpp
index c948d2cd26..febda7a6de 100644
--- a/lib/Dialect/Handshake/MemoryInterfaces.cpp
+++ b/lib/Dialect/Handshake/MemoryInterfaces.cpp
@@ -26,6 +26,7 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MathExtras.h"
+#include <algorithm>
 
 using namespace llvm;
 using namespace mlir;
@@ -316,19 +317,6 @@ void LSQGenerationInfo::fromPorts(FuncMemoryPorts &ports) {
   dataWidth = ports.dataWidth;
   addrWidth = ports.addrWidth;
 
-  handshake::LSQDepthAttr lsqDepthAttr =
-      getDialectAttr<handshake::LSQDepthAttr>(lsqOp);
-  if (lsqDepthAttr) {
-    depthLoad = lsqDepthAttr.getLoadQueueDepth();
-    depthStore = lsqDepthAttr.getStoreQueueDepth();
-    // "depth" Parameter is theoretically unused, but still needed by the
-    // current LSQGenerator
-    depth = std::max(depthLoad, depthStore);
-  } else {
-    depthLoad = 16;
-    depthStore = 16;
-  }
-
   numGroups = ports.getNumGroups();
   numLoads = ports.getNumPorts<LoadPort>();
   numStores = ports.getNumPorts<StorePort>();
@@ -394,6 +382,35 @@ void LSQGenerationInfo::fromPorts(FuncMemoryPorts &ports) {
     ldOrder.push_back(ldOrderOfOneGroup);
   }
 
+  unsigned maxLoadsPerGroup =
+      *std::max_element(loadsPerGroup.begin(), loadsPerGroup.end());
+  unsigned maxStoresPerGroup =
+      *std::max_element(storesPerGroup.begin(), storesPerGroup.end());
+
+  /// Determine load and store queue sizes
+  handshake::LSQDepthAttr lsqDepthAttr =
+      getDialectAttr<handshake::LSQDepthAttr>(lsqOp);
+  if (lsqDepthAttr) {
+    depthLoad = lsqDepthAttr.getLoadQueueDepth();
+    depthStore = lsqDepthAttr.getStoreQueueDepth();
+  } else {
+    // Use default depth of 16.
+    depthLoad = 16;
+    depthStore = 16;
+  }
+
+  // If the load/store queues are not large enough to hold a single group at
+  // once, increase their sizes to the minimum valid depth (i.e., the maximum
+  // number of loads/stores in a group + 1)
+  if (maxLoadsPerGroup >= depthLoad)
+    depthLoad = maxLoadsPerGroup + 1;
+  if (maxStoresPerGroup >= depthStore)
+    depthStore = maxStoresPerGroup + 1;
+
+  // "depth" Parameter is theoretically unused, but still needed by the
+  // current LSQGenerator
+  depth = std::max(depthLoad, depthStore);
+
   /// Adds as many 0s as necessary to the array so that its size equals the
   /// depth. Asserts if the array size is larger than the depth.
   auto capArray = [&](SmallVector<unsigned> &array, unsigned depth) -> void {