From 33d8381e3fc6e66d1d983ef44b44664a67c63e68 Mon Sep 17 00:00:00 2001
From: makslevental <maksim.levental@gmail.com>
Date: Mon, 26 Aug 2024 11:13:31 -0500
Subject: [PATCH] reorder air tablegen

---
 build_tools/ci/build_test_cpp.sh              |  2 +-
 .../plugins/target/AMD-AIE/air/CMakeLists.txt | 61 ++++++++++---------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/build_tools/ci/build_test_cpp.sh b/build_tools/ci/build_test_cpp.sh
index dd3851845..53d190f0f 100644
--- a/build_tools/ci/build_test_cpp.sh
+++ b/build_tools/ci/build_test_cpp.sh
@@ -98,7 +98,7 @@ echo "-----"
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
   ctest --test-dir "$build_dir" -R amd-aie --output-on-failure -j
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-  ctest --test-dir "$build_dir" -R amd-aie -E "pack_peel_pipeline_matmul" --output-on-failure -j
+  ctest --test-dir "$build_dir" -R amd-aie -E "pack_peel_pipeline_matmul|conv_fill_spec_pad" --output-on-failure -j --repeat until-pass:5
 else
   # hack while windows is flaky to get past failing tests
   ctest --test-dir "$build_dir" -R amd-aie --output-on-failure -j --repeat until-pass:5
diff --git a/compiler/plugins/target/AMD-AIE/air/CMakeLists.txt b/compiler/plugins/target/AMD-AIE/air/CMakeLists.txt
index 764dc66cd..dc1fbe635 100644
--- a/compiler/plugins/target/AMD-AIE/air/CMakeLists.txt
+++ b/compiler/plugins/target/AMD-AIE/air/CMakeLists.txt
@@ -21,19 +21,6 @@ iree_cc_library(
 # AIR Dialect
 ###############################################################################
 
-iree_cc_library(
-    NAME
-        AIRDialectIR
-    SRCS
-      ${IREE_MLIR_AIR_SOURCE_DIR}/lib/Dialect/AIR/IR/AIRDialect.cpp
-    DEPS
-      ::defs
-      ::AIRDialectGen
-      ::AIRInterfaceGen
-      ::AIRTransformOpsGen
-      MLIRIR
-)
-
 iree_tablegen_library(
   NAME
     AIRDialectGen
@@ -60,6 +47,26 @@ iree_tablegen_library(
     -gen-op-interface-defs Dialect/AIR/AIROpInterfaces.cpp.inc
 )
 
+
+iree_tablegen_library(
+  NAME
+    AIRConversionPassesIncGen
+  TD_FILE
+    "${IREE_MLIR_AIR_SOURCE_DIR}/include/air/Conversion/Passes.td"
+  OUTS
+    -gen-pass-decls Conversion/Passes.h.inc
+)
+
+iree_tablegen_library(
+  NAME
+    AIRTransformOpsGen
+  TD_FILE
+    "${IREE_MLIR_AIR_SOURCE_DIR}/include/air/Dialect/AIR/AIRTransformOps.td"
+  OUTS
+    -gen-op-decls Dialect/AIR/AIRTransformOps.h.inc
+    -gen-op-defs Dialect/AIR/AIRTransformOps.cpp.inc
+)
+
 iree_cc_library(
   NAME
     AIRTransformOps
@@ -70,19 +77,24 @@ iree_cc_library(
     ::AIRDialectIR
     ::AIRTransformOpsGen
     ::AIRTransformPasses
+    ::AIRConversionPassesIncGen
     iree::target::amd-aie::aie::AIEDialectIR
     MLIRIR
     MLIRLinalgTransformOps
 )
 
-iree_tablegen_library(
+iree_cc_library(
   NAME
-    AIRTransformOpsGen
-  TD_FILE
-    "${IREE_MLIR_AIR_SOURCE_DIR}/include/air/Dialect/AIR/AIRTransformOps.td"
-  OUTS
-    -gen-op-decls Dialect/AIR/AIRTransformOps.h.inc
-    -gen-op-defs Dialect/AIR/AIRTransformOps.cpp.inc
+    AIRDialectIR
+  SRCS
+    ${IREE_MLIR_AIR_SOURCE_DIR}/lib/Dialect/AIR/IR/AIRDialect.cpp
+  DEPS
+    ::defs
+    ::AIRDialectGen
+    ::AIRInterfaceGen
+    ::AIRTransformOpsGen
+    ::AIRConversionPassesIncGen
+    MLIRIR
 )
 
 ###############################################################################
@@ -121,15 +133,6 @@ iree_tablegen_library(
 # AIR Conversion Passes
 ###############################################################################
 
-iree_tablegen_library(
-  NAME
-    AIRConversionPassesIncGen
-  TD_FILE
-    "${IREE_MLIR_AIR_SOURCE_DIR}/include/air/Conversion/Passes.td"
-  OUTS
-    -gen-pass-decls Conversion/Passes.h.inc
-)
-
 iree_cc_library(
   NAME
     AIRConversionPassHeaders