merge main

nod-ai · Dec 2, 2024 · 9247b96 · 9247b96
2 parents 6ef6412 + 1c7e406
commit 9247b96
Show file tree

Hide file tree

Showing 19 changed files with 624 additions and 402 deletions.
diff --git a/build_tools/ci/cpu_comparison/run.py b/build_tools/ci/cpu_comparison/run.py
@@ -696,7 +696,6 @@ def generate_aie_vmfb(
         "--iree-scheduling-optimize-bindings=false",
         "--iree-hal-memoization=false",
         "--iree-hal-indirect-command-buffers=false",
-        f"--mlir-disable-threading",
         "--mlir-elide-resource-strings-if-larger=10",
     ]
 

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/AIETarget.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/AIETarget.cpp
@@ -483,7 +483,8 @@ LogicalResult AIETargetBackend::serializeExecutable(
             /*xclBinInstanceName=*/"IREE",
             /*amdAIEInstallDir=*/options.amdAieInstallDir,
             /*InputXCLBin=*/std::nullopt,
-            /*ukernel=*/options.enableAMDAIEUkernels))) {
+            /*ukernel=*/options.enableAMDAIEUkernels,
+            /*additionalPeanoOptFlags=*/options.additionalPeanoOptFlags))) {
       return failure();
     }
 

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/AIETarget.h b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/AIETarget.h
@@ -9,7 +9,6 @@
 
 #include <string>
 
-#include "aie/AIEDialect.h"
 #include "iree-amd-aie/Transforms/KernelDispatch.h"
 #include "iree/compiler/Dialect/HAL/Target/TargetBackend.h"
 #include "iree/compiler/Dialect/HAL/Target/TargetDevice.h"
@@ -29,9 +28,14 @@ struct AMDAIEOptions {
   // Dump system commands used during compilation
   bool showInvokedCommands{false};
 
-  // Use the legacy chess compiler.
+  // Use the chess compiler. The default is to use peano.
   bool useChess{false};
 
+  // Additional flags to run peano's opt with (if peano is the backend compiler
+  // selected). These are mostly appended on the end of the default flags, but
+  // some flags may replace existing flags if they conflict.
+  std::string additionalPeanoOptFlags;
+
   // Print IR after all MLIR passes run in aie2xclbin (to stderr).
   bool aie2xclbinPrintIrAfterAll{false};
 
@@ -63,6 +67,13 @@ struct AMDAIEOptions {
 
   void bindOptions(OptionsBinder &binder) {
     static llvm::cl::OptionCategory category("AMD AIE Options");
+
+    binder.opt<std::string>(
+        "iree-amd-aie-additional-peano-opt-flags", additionalPeanoOptFlags,
+        llvm::cl::cat(category),
+        llvm::cl::desc("Additional flags for peano's opt. Example: "
+                       "\"-O3 --magic-flag\"."));
+
     binder.opt<std::string>(
         "iree-amd-aie-install-dir", amdAieInstallDir, llvm::cl::cat(category),
         llvm::cl::desc("Path to AMDAIE installation directory (typically the "