Adding air_init() to unit tests (#185)

* Changing all unit tests to call air_inti() * Adding path to aircc which points to the location of mlir-aie if users follow the current building documentation * Forgot to add get_libxaie_ctx to 21 * Deleting new makefiles * clang-format
Xilinx · Feb 24, 2023 · 93f87c2 · 93f87c2
1 parent f0dcc0a
commit 93f87c2
Show file tree

Hide file tree

Showing 40 changed files with 342 additions and 73 deletions.
diff --git a/python/air/compiler/aircc/main.py b/python/air/compiler/aircc/main.py
@@ -358,6 +358,7 @@ def run_flow(opts):
       cmd += [f'-I{thispath}/../../../../runtime_lib/airhost/include']
       cmd += [f'-I{thispath}/../../../../runtime_lib']
       cmd += [f'-I{thispath}/../../../../../aie/runtime_lib']
+      cmd += [f'-I{thispath}/../../../../../utils/mlir-aie/runtime_lib']
       cmd += ['-DLIBXAIENGINEV2']
       cmd += ['-DAIE_LIBXAIE_ENABLE', '-fPIC', '-c']
       cmd += ['-o', obj_file, cpp_file]

diff --git a/test/02_mb_dispatch/test.cpp b/test/02_mb_dispatch/test.cpp
@@ -15,6 +15,13 @@
 
 int main(int argc, char *argv[]) {
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_iterate_agents(
       [](air_agent_t a, void *d) {
@@ -26,7 +33,7 @@ int main(int argc, char *argv[]) {
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
 
   if (agents.empty()) {
-    std::cout << "fail." << std::endl;
+    std::cout << "No agents found. Exiting" << std::endl;
     return -1;
   }
 

diff --git a/test/03_mb_lock_rel/test.cpp b/test/03_mb_lock_rel/test.cpp
@@ -27,6 +27,13 @@ int main(int argc, char *argv[])
   auto num_rows = 1;
   auto num_cols = 1;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -49,7 +56,7 @@ int main(int argc, char *argv[])
   air_packet_device_init(shim_pkt, XAIE_NUM_COLS);
   air_queue_dispatch_and_wait(q, wr_idx, shim_pkt);
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
 
   mlir_aie_print_tile_status(xaie, col, row);
 

diff --git a/test/06_air_link_shared/test.cpp b/test/06_air_link_shared/test.cpp
@@ -34,6 +34,13 @@
 
 int main(int argc, char *argv[]) {
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -55,7 +62,7 @@ int main(int argc, char *argv[]) {
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
 
   queue_t *q = queues[0];
 

diff --git a/test/07_mb_beef_maker/test.cpp b/test/07_mb_beef_maker/test.cpp
@@ -31,6 +31,13 @@ main(int argc, char *argv[])
   auto col = 7;
   auto row = 2;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -53,7 +60,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
     std::cout << "Error initializing libxaie" << std::endl;
     return -1;

diff --git a/test/09_mb_hsa_herd_lock/test.cpp b/test/09_mb_hsa_herd_lock/test.cpp
@@ -24,6 +24,13 @@ int main(int argc, char *argv[])
   auto col = 7;
   auto row = 2;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -46,7 +53,7 @@ int main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
     std::cout << "Error initializing libxaie" << std::endl;
     return -1;

diff --git a/test/10_mb_shim_dma_to_tile_dma/test.cpp b/test/10_mb_shim_dma_to_tile_dma/test.cpp
@@ -29,12 +29,19 @@ main(int argc, char *argv[])
   uint64_t col = 7;
   uint64_t row = 0;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
 
   if (agents.empty()) {
-    std::cout << "fail." << std::endl;
+    std::cout << "No agents found. Exiting." << std::endl;
     return -1;
   }
 
@@ -51,7 +58,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
     std::cout << "Error initializing libxaie" << std::endl;
     return -1;

diff --git a/test/11_mb_shim_dma_from_tile_dma/test.cpp b/test/11_mb_shim_dma_from_tile_dma/test.cpp
@@ -29,6 +29,13 @@ main(int argc, char *argv[])
   uint64_t col = 6;
   uint64_t row = 0;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_iterate_agents(
       [](air_agent_t a, void *d) {
@@ -57,7 +64,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
     std::cout << "Error initializing libxaie" << std::endl;
     return -1;

diff --git a/test/12_dual_channel_shim_dma/test.cpp b/test/12_dual_channel_shim_dma/test.cpp
@@ -29,6 +29,13 @@ main(int argc, char *argv[])
   uint64_t col = 7;
   uint64_t row = 0;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -51,7 +58,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
     std::cout << "Error initializing libxaie" << std::endl;
     return -1;

diff --git a/test/13_mb_add_one/test.cpp b/test/13_mb_add_one/test.cpp
@@ -29,12 +29,19 @@ main(int argc, char *argv[])
   uint64_t row = 0;
   uint64_t col = 6;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
 
   if (agents.empty()) {
-    std::cout << "fail." << std::endl;
+    std::cout << "No agents found. Exiting." << std::endl;
     return -1;
   }
 
@@ -51,10 +58,9 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie =
-      (aie_libxaie_ctx_t *)air_init_libxaie(0 /* device_id (optional)*/);
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
-    std::cout << "Error initializing libxaie" << std::endl;
+    std::cout << "Error getting libxaie context" << std::endl;
     return -1;
   }
 

diff --git a/test/14_multi_shim_dma/test.cpp b/test/14_multi_shim_dma/test.cpp
@@ -29,6 +29,13 @@ main(int argc, char *argv[])
   uint64_t col = 7;
   uint64_t row = 0;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -51,7 +58,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
     std::cout << "Error initializing libxaie" << std::endl;
     return -1;

diff --git a/test/16_multi_shim_dma_all_channels/test.cpp b/test/16_multi_shim_dma_all_channels/test.cpp
@@ -29,12 +29,19 @@ main(int argc, char *argv[])
   uint64_t col = 7;
   uint64_t row = 0;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
 
   if (agents.empty()) {
-    std::cout << "fail." << std::endl;
+    std::cout << "No agents found. Exiting." << std::endl;
     return -1;
   }
 
@@ -51,7 +58,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
   if (xaie == NULL) {
     std::cout << "Error initializing libxaie" << std::endl;
     return -1;

diff --git a/test/19_air_nd_memcpy_to_tile_dma/test.cpp b/test/19_air_nd_memcpy_to_tile_dma/test.cpp
@@ -30,6 +30,14 @@ using namespace air::partitions::partition_0;
 int
 main(int argc, char *argv[])
 {
+
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -51,7 +59,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
 
   queue_t *q = queues[0];
 

diff --git a/test/20_air_nd_memcpy_from_tile_dma/test.cpp b/test/20_air_nd_memcpy_from_tile_dma/test.cpp
@@ -35,6 +35,13 @@ main(int argc, char *argv[])
   uint64_t row = 4;
   uint64_t col = 5;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_iterate_agents(
       [](air_agent_t a, void *d) {
@@ -46,7 +53,7 @@ main(int argc, char *argv[])
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
 
   if (agents.empty()) {
-    std::cout << "fail." << std::endl;
+    std::cout << "No agents found. Exiting." << std::endl;
     return -1;
   }
 
@@ -62,7 +69,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
 
   queue_t *q = queues[0];
 

diff --git a/test/21_air_nd_memcpy_2d/test.cpp b/test/21_air_nd_memcpy_2d/test.cpp
@@ -41,12 +41,19 @@ main(int argc, char *argv[])
   uint64_t row = 3;
   uint64_t col = 3;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
 
   if (agents.empty()) {
-    std::cout << "fail." << std::endl;
+    std::cout << "No agents found. Exiting." << std::endl;
     return -1;
   }
 
@@ -62,7 +69,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
 
   queue_t *q = queues[0];
 

diff --git a/test/23_air_shim_dma_to_tile_dma/test.cpp b/test/23_air_shim_dma_to_tile_dma/test.cpp
@@ -34,6 +34,13 @@ main(int argc, char *argv[])
   uint64_t row = 2;
   uint64_t col = 7;
 
+  hsa_status_t init_status = air_init();
+
+  if (init_status != HSA_STATUS_SUCCESS) {
+    std::cout << "air_init() failed. Exiting" << std::endl;
+    return -1;
+  }
+
   std::vector<air_agent_t> agents;
   auto get_agents_ret = air_get_agents(agents);
   assert(get_agents_ret == HSA_STATUS_SUCCESS && "failed to get agents!");
@@ -55,7 +62,7 @@ main(int argc, char *argv[])
     queues.push_back(q);
   }
 
-  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_init_libxaie();
+  aie_libxaie_ctx_t *xaie = (aie_libxaie_ctx_t *)air_get_libxaie_ctx();
 
   queue_t *q = queues[0];