Merge branch 'main' into split_inputs_outputs

nod-ai · Nov 20, 2024 · a91c568 · a91c568
2 parents bca6998 + 96dfcc0
commit a91c568
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToTransaction.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToTransaction.cpp
@@ -93,10 +93,10 @@ class TransactionBuilder {
     uint32_t addr =
         direction == AMDAIE::DMAChannelDir::MM2S ? 0x1D214 : 0x1D204;
     if (channel == 1) addr += 0x8;
-    if (col && row) {
-      addr |= ((col & 0xff) << colShift) | ((row & 0xff) << rowShift) |
-              (addr & 0xFFFFF);
-    }
+    // TODO(jornt): use aie-rt's transaction serializer instead to avoid these
+    // indiscrepancies between this file and aie-rt.
+    addr = ((col & 0xff) << colShift) | ((row & 0xff) << rowShift) |
+           (addr & 0xFFFFF);
     uint32_t value = 0;
     value |= bdId & 0xF;
     value |= (repeatCount & 0xFF) << 16;

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_transaction.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_transaction.mlir
@@ -100,7 +100,7 @@ module attributes {hal.executable.target = #executable_target_amdaie_xclbin_fb}
 // CHECK:       0x00000028
 // CHECK:       0x00000000
 // CHECK:       0x00000000
-// CHECK:       0x0001D21C
+// CHECK:       0x0601D21C
 // CHECK:       0x00000000
 // CHECK:       0x803F0002
 // CHECK:       0x00000018
@@ -127,7 +127,7 @@ module attributes {hal.executable.target = #executable_target_amdaie_xclbin_fb}
 // CHECK:       0x00000038
 // CHECK:       0x00000000
 // CHECK:       0x00000000
-// CHECK:       0x0001D214
+// CHECK:       0x0401D214
 // CHECK:       0x00000000
 // CHECK:       0x80FF000F
 // CHECK:       0x00000018