[CIR][NFC] Match coding style with clang-format CI version

Xilinx · Nov 22, 2024 · 522e72b · 522e72b
1 parent 255225c
commit 522e72b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/include/aie/CIR/CIRToAIEPasses.h b/include/aie/CIR/CIRToAIEPasses.h
@@ -1,4 +1,4 @@
-//===- CIRToAIEpasses.h ----------------------------------------------*- C++ -*-===//
+//===- CIRToAIEpasses.h -----------------------------------------*- C++ -*-===//
 //
 // This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -23,8 +23,7 @@ namespace xilinx::AIE::CIR {
 std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>>
 createCIRToAIEPreparePass();
 
-std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>>
-createCIRToAIEPass();
+std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>> createCIRToAIEPass();
 
 std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>>
 createCIRToAIEInlineKernelLambdaPass();
@@ -36,6 +35,6 @@ createCIRToAIEDecaptureKernelPass();
 #define GEN_PASS_REGISTRATION
 #include "aie/CIR/CIRToAIEPasses.h.inc"
 
-}
+} // namespace xilinx::AIE::CIR
 
 #endif
diff --git a/include/aie/CIR/runtime/aie++/aie++.hpp b/include/aie/CIR/runtime/aie++/aie++.hpp
@@ -93,9 +93,12 @@ template <typename Channel> struct accessor {
   // implemented"' failed.
   //
   // accessor(access_t& a) : storage {a} { aquire<Channel>(); }
-  accessor(access_t& a) { storage = &a; aquire<Channel>(); }
+  accessor(access_t& a) {
+    storage = &a;
+    aquire<Channel>();
+  }
   auto& operator[](std::size_t index) { return (*storage)[index]; }
-  operator typename Channel::access_t&() { return *storage; }
+  operator typename Channel::access_t &() { return *storage; }
   ~accessor() { release<Channel>(); }
 };
 
@@ -142,7 +145,8 @@ enum : std::int8_t { npu1 = 42 };
 // "Unique" with the lambda is used to generate a different type for multiple
 // instantiation, so we can have a design with several accelerators of the same
 // type
-template <auto DeviceModel = npu1, typename Unique = decltype([] {})> struct device {
+template <auto DeviceModel = npu1, typename Unique = decltype([] {})>
+struct device {
   template <int X, int Y>
   tile<X, Y, device> tile()
       __attribute__((annotate("aie.device.tile", X, Y, DeviceModel,

diff --git a/lib/CIR/CIRToAIEPasses.cpp b/lib/CIR/CIRToAIEPasses.cpp
@@ -89,7 +89,8 @@ void eraseOpsAndUsers(OpRange &&opsToErase) {
   llvm::SmallVector<mlir::Operation *> sorted{allOpsAndUsers.begin(),
                                               allOpsAndUsers.end()};
   mlir::computeTopologicalSorting(sorted);
-  LLVM_DEBUG(for (auto *op : sorted)
+  LLVM_DEBUG(for (auto *op
+                  : sorted)
                  op->emitRemark("eraseOpsAndUsers: topologicalSort"));
   for (auto *op : llvm::reverse(sorted)) {
     LLVM_DEBUG(op->emitRemark("eraseOpsAndUsers: reverse"));

diff --git a/test/CIR/aie++/empty.cpp b/test/CIR/aie++/empty.cpp
@@ -1,13 +1,22 @@
 /* A tile with an empty program
+
+   Show that declaration of multiple devices of the same kind are actually
+   different types, allowing 2 devices in the same platform distinguished in a
+   type-safe way
 */
 
 #include "aie++.hpp"
 
 int main() {
   aie::device<aie::npu1> d;
-  d.tile<2, 3>().program([]{});
+  d.tile<2, 3>().program([] {});
   d.run();
   // Check we can get another type for another accelerator of the same kind
   aie::device<aie::npu1> other_device_unused;
   auto unused_tile = other_device_unused.tile<2, 3>();
+
+  // Check the type safety
+  static_assert(!std::is_same_v<decltype(d), decltype(other_device_unused)>);
+  static_assert(
+      !std::is_same_v<decltype(d.tile<2, 3>()), decltype(unused_tile)>);
 }
diff --git a/test/CIR/aie++/example.cpp b/test/CIR/aie++/example.cpp
@@ -28,6 +28,6 @@ int main() {
   auto t = d.tile<1, 4>();
   auto b = t.buffer<int, 8192>();
   t.program([&] { b[3] = 14; });
-  d.tile<2, 3>().program([]{});
+  d.tile<2, 3>().program([] {});
   d.run();
 }