Jnider airbin #259

jnider · 2023-07-20T17:07:16Z

End-to-end flow is complete but I haven't validated the results yet.

keryell · 2023-07-21T01:59:54Z

.github/workflows/buildAndTest.yml

@@ -72,6 +72,12 @@ jobs:
      - name: Rebuild and Install libxaie
        run: utils/github-clone-build-libxaie.sh

+      - name: Install necessary build tools 
+        run: sudo apt install autoconf flex bison gawk autopoint -y


Ouch, I did not even know we can have -y at the end! :-)
Perhaps you could keep it at the beginning to have a clearer statement and sort the package names to be easier to check visually we have already the right package.

fifield · 2023-07-25T16:55:26Z

runtime_lib/controller/main.cpp

+    // u32 shimDMA0 = (pkt->arg[1] >> 16) & 0xff;
+    // u32 shimDMA1 = (pkt->arg[1] >> 24) & 0xff;


fifield · 2023-07-25T16:55:41Z

runtime_lib/airhost/queue.cpp

+    not a big deal. This allows us to do only a single pass on the ELF
+    sections so it seems like a good trade-off.
+  */
+  printf("There are %lu sections\n", shnum);


There are some extra printf here and below. I think these should all be DBG_PRINT? That is, the runtime should be silent by default.

fifield · 2023-07-25T16:57:21Z

test/313_add_one_airbin/Makefile

+# 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 --host-target=x86_64-amd-linux-gnu --aie-generate-airbin --sysroot= $< \
+						-I/opt/xaiengine/include -L/opt/xaiengine/lib -Wl,-R/opt/xaiengine/lib \
+						-I$(ACDC_AIE)/runtime_lib/x86_64/test_lib/include \
+						-I$(ACDC_AIR)/runtime_lib/airhost/include  \
+						-I$(ACDC_AIE)/runtime_lib \
+						$(ACDC_AIE)/runtime_lib/x86_64/test_lib/src/test_library.cpp \
+						-L$(ACDC_AIR)/runtime_lib/airhost \
+						../../elfutils/libelf/libelf.a \
+						-Wl,--whole-archive -lairhost -Wl,--no-whole-archive -lstdc++ -ldl -o $@  test.cpp
+
+clean::
+	rm -rf acdc_project *.elf


This needs to be an automated lit test, not a manual makefile based test.

fifield · 2023-07-25T16:58:06Z

test/313_add_one_airbin/test.cpp

+
+  ret = air_load_airbin(q, "airbin.elf", col);
+  if (!ret) {
+    printf("Loading airbin failed: %d\n", ret);


exit nonzero on failure

fifield · 2023-07-25T16:59:22Z

utils/github-clone-build-elfutils.sh

+if [[ ! -d $INSTALL_DIR ]]; then
+  git clone --branch $HASH --depth 1 https://github.com/jnider/elfutils.git $INSTALL_DIR
+fi
+
+cd $INSTALL_DIR
+autoreconf -v -f -i
+./configure --program-prefix="air-" --disable-debuginfod --disable-libdebuginfod --enable-maintainer-mode
+
+
+# build libeu.a, required for libelf.so
+make -C lib
+
+# build libelf.a, libelf_pic.a and libelf.so
+make -C libelf


Each of these steps should have error handling and reporting. Some of the existing scripts (not changed by this PR) have the same problem.

To control which platforms are built, a top-level Makefile is added. It calls the child makefiles as needed, to build or clean a specific platform. All platforms can be built or cleaned together, or each platform can be addressed individually. To build a specific platform, call: make <platform> To clean a specific platform, call: make <platform>-clean To control them all at the same time, use 'make' or 'make clean' without any additional parameters. Signed-off-by: Joel Nider <[email protected]>

Signed-off-by: Joel Nider <[email protected]>

Add base addresses to platform.h Change register offsets into defines so they are easier to read. Add some helper functions for common operations like resetting a column. Signed-off-by: Joel Nider <[email protected]>

Signed-off-by: Joel Nider <[email protected]>

Libelf (one library inside the 'elfutils' repo) is a library for manipulating ELF files from C programs. It is used when generating AIRBIN files by the compiler backend and also when reading them in the runtime for loading to the device. Signed-off-by: Joel Nider <[email protected]>

The runtime lib was modified to use libelf for loading airbin files. Since the runtime lib is built as a static library (.a file), it does not include a link step and can therefore not be linked directly with libelf. However, it does call functions in libelf when loading airbin files, which means it has a dependency on libelf. That forces all applications that link with the runtime lib to also link with libelf, even if those functions are not used in that particular application. The command line options are also put on separate lines and sorted by type (library path, include path, etc.) to make it easier to modify, diff and understand what is happening in general. Signed-off-by: Joel Nider <[email protected]>

Signed-off-by: Joel Nider <[email protected]>

An AIRBIN is an ELF file that contains AIE configuration and executable code. It is loaded to the device by the runtime by copying it to device memory and then notifying the device that continues the process. Add code to read the file, place it in device memory and notify the device. This depends on libelf (from elfutils) that is built in: github-clone-build-elfutils.sh Signed-off-by: Joel Nider <[email protected]>

Signed-off-by: Joel Nider <[email protected]>

Add a new packet type AIR_PKT_TYPE_AIRBIN for loading an AIRBIN. The packet holds the base address in device memory where the AIRBIN has been loaded by the runtime_lib on the host. The packet handler builds a CDMA descriptor chain based on the AIRBIN sections and loads them into AIE memory. The ARM_CONTROLLER define is set by the compiler so it is available to all source files. The CDMA driver is moved to a separate source file. Currently, only the scatter/gather mode has been implemented. A future patch will add the simple mode as well, and then the legacy CDMA code can be removed. Add a function to reset a shim tile. Follows the procedure for shim tile resets. The reset is a global action but masked by registers belonging to each shim tile. By unmasking a particular tile, it will participate in the reset. The actual reset is performed through the NPI interface, then all the registers are unmasked to prevent accidental reset later. Signed-off-by: Joel Nider <[email protected]>

jnider requested review from jgmelber, eddierichter-amd and atgutier July 20, 2023 17:07

jnider force-pushed the jnider-airbin branch 13 times, most recently from d8880d3 to 9114697 Compare July 21, 2023 01:24

jnider marked this pull request as ready for review July 21, 2023 01:56

keryell reviewed Jul 21, 2023

View reviewed changes

fifield reviewed Jul 25, 2023

View reviewed changes

jnider force-pushed the jnider-airbin branch from 1edb850 to cd2ea80 Compare August 4, 2023 20:57

jnider force-pushed the jnider-airbin branch from cd2ea80 to 8d1f51d Compare August 10, 2023 17:48

jnider added 7 commits August 17, 2023 18:56

controller: fix warnings

626f5bd

Signed-off-by: Joel Nider <[email protected]>

controller: change hardcoded addresses to defines

73a7f15

Add base addresses to platform.h Change register offsets into defines so they are easier to read. Add some helper functions for common operations like resetting a column. Signed-off-by: Joel Nider <[email protected]>

utils: script to build libxaie

55d6359

Signed-off-by: Joel Nider <[email protected]>

platform: load & unload driver when loading fpga

80438b3

Signed-off-by: Joel Nider <[email protected]>

test: add 313 for airbin

02d938b

Signed-off-by: Joel Nider <[email protected]>

jnider added 3 commits August 17, 2023 19:22

Add CDMA to makefile

2914b3d

Signed-off-by: Joel Nider <[email protected]>

jnider force-pushed the jnider-airbin branch from aca74a8 to c28166f Compare August 18, 2023 01:38

jgmelber mentioned this pull request Aug 24, 2023

Squashed AIRBIN generation and runtime #128

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Jnider airbin #259

Jnider airbin #259

jnider commented Jul 20, 2023

keryell Jul 21, 2023

fifield Jul 25, 2023

fifield Jul 25, 2023

fifield Jul 25, 2023

fifield Jul 25, 2023 •

edited

Loading

fifield Jul 25, 2023

		// u32 shimDMA0 = (pkt->arg[1] >> 16) & 0xff;
		// u32 shimDMA1 = (pkt->arg[1] >> 24) & 0xff;

Jnider airbin #259

Are you sure you want to change the base?

Jnider airbin #259

Conversation

jnider commented Jul 20, 2023

keryell Jul 21, 2023

Choose a reason for hiding this comment

fifield Jul 25, 2023

Choose a reason for hiding this comment

fifield Jul 25, 2023

Choose a reason for hiding this comment

fifield Jul 25, 2023

Choose a reason for hiding this comment

fifield Jul 25, 2023 • edited Loading

Choose a reason for hiding this comment

fifield Jul 25, 2023

Choose a reason for hiding this comment

fifield Jul 25, 2023 •

edited

Loading