Adding air_init() to unit tests

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]

test/02_mb_dispatch/Makefile

@@ -0,0 +1,30 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+CC=clang
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+LDFLAGS = -fuse-ld=lld -rdynamic \
+	  -DLIBXAIENGINEV2 \
+		-lxaiengine \
+		-Wl,--whole-archive -lairhost -Wl,--no-whole-archive \
+		-lstdc++ \
+		-lm \
+		-Wl,--no-as-needed -ldl
+
+CFLAGS += -g -I/opt/xaiengine/include
+CFLAGS += -std=c++17 -I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib \
+          -DAIR_LIBXAIE_ENABLE
+LDFLAGS += -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib
+LDFLAGS += -L$(ACDC_AIR)/runtime_lib/airhost
+
+all: test.exe
+
+%.exe: test.cpp
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ACDC_AIE)/runtime_lib/test_library.cpp test.cpp -Wl,--whole-archive -Wl,--no-whole-archive
+
+
+clean::
+	rm -rf *.exe 

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;
   }
 

test/03_mb_lock_rel/Makefile

@@ -0,0 +1,16 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+all: test.elf
+
+test.elf: aie.mlir test.cpp
+	aiecc.py -v --aie-generate-xaiev2 --host-target=x86_64-amd-linux-gnu --sysroot= $< -I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib $(ACDC_AIE)/runtime_lib/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost test.cpp -Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -o $@ 
+
+clean::
+	rm -rf acdc_project *.elf

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);
 

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];
 

test/07_mb_beef_maker/Makefile

@@ -0,0 +1,16 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+all: test.elf
+
+test.elf: aie.mlir test.cpp
+	aiecc.py -v --aie-generate-xaiev2 --host-target=x86_64-amd-linux-gnu --sysroot= $< -I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib $(ACDC_AIE)/runtime_lib/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost test.cpp -Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -o $@ 
+
+clean::
+	rm -rf acdc_project *.elf

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;

test/09_mb_hsa_herd_lock/Makefile

@@ -0,0 +1,16 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+all: test.elf
+
+test.elf: aie.mlir test.cpp
+	aiecc.py -v --aie-generate-xaiev2 --host-target=x86_64-amd-linux-gnu --sysroot= $< -I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib $(ACDC_AIE)/runtime_lib/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost test.cpp -Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -o $@ 
+
+clean::
+	rm -rf acdc_project *.elf

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;

test/10_mb_shim_dma_to_tile_dma/Makefile

@@ -0,0 +1,16 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+all: test.elf
+
+test.elf: aie.mlir test.cpp
+	aiecc.py -v --aie-generate-xaiev2 --host-target=x86_64-amd-linux-gnu --sysroot= $< -I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib $(ACDC_AIE)/runtime_lib/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost test.cpp -Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -o $@ 
+
+clean::
+	rm -rf acdc_project *.elf

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;

test/11_mb_shim_dma_from_tile_dma/Makefile

@@ -0,0 +1,16 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+all: test.elf
+
+test.elf: aie.mlir test.cpp
+	aiecc.py -v --aie-generate-xaiev2 --host-target=x86_64-amd-linux-gnu --sysroot= $< -I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib $(ACDC_AIE)/runtime_lib/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost test.cpp -Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -o $@ 
+
+clean::
+	rm -rf acdc_project *.elf

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;

test/12_dual_channel_shim_dma/Makefile

@@ -0,0 +1,16 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+all: test.elf
+
+test.elf: aie.mlir test.cpp
+	aiecc.py -v --aie-generate-xaiev2 --host-target=x86_64-amd-linux-gnu --sysroot= $< -I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib $(ACDC_AIE)/runtime_lib/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost test.cpp -Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -o $@ 
+
+clean::
+	rm -rf acdc_project *.elf

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;

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;
   }
 
@@ -52,9 +59,9 @@ main(int argc, char *argv[])
   }
 
   aie_libxaie_ctx_t *xaie =
-      (aie_libxaie_ctx_t *)air_init_libxaie(0 /* device_id (optional)*/);
+      (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;
   }
 

test/14_multi_shim_dma/Makefile

@@ -0,0 +1,16 @@
+# Copyright (C) 2022, Xilinx Inc.
+# Copyright (C) 2022, Advanced Micro Devices, Inc.
+# SPDX-License-Identifier: MIT
+
+ACDC_AIE = $(dir $(shell which aie-opt))/..
+ACDC_AIR = $(dir $(shell which air-opt))/..
+
+all: test.elf
+
+test.elf: aie.mlir test.cpp
+	aiecc.py -v --aie-generate-xaiev2 --host-target=x86_64-amd-linux-gnu --sysroot= $< -I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include -I$(ACDC_AIE)/runtime_lib $(ACDC_AIE)/runtime_lib/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost test.cpp -Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -o $@ 
+
+clean::
+	rm -rf acdc_project *.elf