add delegate for 32-bit and modify readme.

Signed-off-by: Elham <elham.harirpoush@arm.com>
Change-Id: Idc03badf532918925fc59db81a7affab439075f1

2 files changed, 94 insertions, 12 deletions

diff --git a/docker/README.md b/docker/README.md
index beb201836d..4cd5e1a547 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,9 +5,9 @@
 
 <b>armnn-android</b> folder has the docker file to build a Android NDK container to build ARMNN.
 
-## [ArmNN on x86_64 for arm64](https://github.com/ARM-software/armnn/blob/branches/armnn_20_02/BuildGuideCrossCompilation.md)
+## [ArmNN on x86_64 for arm64 and arm32](https://github.com/ARM-software/armnn/blob/branches/armnn_20_02/BuildGuideCrossCompilation.md)
 
-<b>x86_64</b> folder has the docker file to build ArmNN under an x86_64 system to target an Arm64 system.
+<b>x86_64</b> folder has the docker file to build ArmNN under an x86_64 system to target an Arm64 and Arm32 systems.
 
 # To build a docker images
 ```bash
diff --git a/docker/x86_64/Dockerfile b/docker/x86_64/Dockerfile
index 769e716024..e96b1e9e3d 100644
--- a/docker/x86_64/Dockerfile
+++ b/docker/x86_64/Dockerfile
@@ -70,7 +70,7 @@ RUN apt-get update && apt-get install -y \
     g++ && rm -rf /var/lib/apt/lists/*
 
 # Install Cross-compiling ToolChain
-RUN apt-get update && apt-get install -y crossbuild-essential-arm64
+RUN apt-get update && apt-get install -y crossbuild-essential-arm64 crossbuild-essential-armhf
 
 # Install Cmake 3.19
 RUN cd $HOME && \
@@ -104,7 +104,17 @@ RUN cd $HOME/google/protobuf-3.12.0 && \
     --with-protoc=$HOME/armnn-devenv/google/x86_64_pb_install/bin/protoc && \
     make install -j$(nproc)
 
-# Dep Error - Bug ARMNN 
+# Build the arm32 version of the protobuf libraries
+RUN cd $HOME/google/protobuf-3.12.0 && \
+    mkdir arm32_build && cd arm32_build && \
+    export CC=arm-linux-gnueabihf-gcc && \
+    export CXX=arm-linux-gnueabihf-g++ && \
+    ../configure --host=arm-linux \
+    --prefix=$HOME/armnn-devenv/google/arm32_pb_install \
+    --with-protoc=$HOME/armnn-devenv/google/x86_64_pb_install/bin/protoc && \
+    make install -j$(nproc)
+
+# Dep Error - Bug ARMNN
 RUN apt-get update && apt-get install -y \
      python-numpy
 
@@ -112,26 +122,36 @@ RUN apt-get update && apt-get install -y \
 # ENV PATH=$HOME/armnn-devenv/google/x86_64_pb_install/bin/:$PATH
 # ENV LD_LIBRARY_PATH=$HOME/armnn-devenv/google/x86_64_pb_install/lib/:$LD_LIBRARY_PATH
 
-# Download ArmNN
+# Download ArmNN 64-bit
 RUN cd $HOME/armnn-devenv && git clone "https://review.mlplatform.org/ml/armnn" && \
-    cd armnn && git checkout master
+    cd armnn/ && git checkout master
+
+# Download ArmNN 32-bit
+RUN cd $HOME/armnn-devenv && git clone "https://review.mlplatform.org/ml/armnn" armnn-32 && \
+    cd armnn-32/ && git checkout master
 
-# Build Compute Library
+# Build 64-bit Compute Library
 RUN cd $HOME/armnn-devenv/ && git clone https://review.mlplatform.org/ml/ComputeLibrary && \
     cd ComputeLibrary && \
     git checkout $($HOME/armnn-devenv/armnn/scripts/get_compute_library.sh -p) && \
     scons Werror=0 arch=arm64-v8a neon=1 opencl=1 embed_kernels=1 extra_cxx_flags="-fPIC" -j$(nproc)
 
+# Build 32-bit Compute Library
+RUN cd $HOME/armnn-devenv/ && mkdir ComputeLibrary_32 && git clone https://review.mlplatform.org/ml/ComputeLibrary ComputeLibrary_32 && \
+    cd ComputeLibrary_32 &&\
+    git checkout $($HOME/armnn-devenv/armnn/scripts/get_compute_library.sh -p) && \
+    scons Werror=0 arch=armv7a neon=1 opencl=1 embed_kernels=1 extra_cxx_flags="-fPIC" -j$(nproc)
+
 # Download Tensorflow (Checkout latest tested version of TF using get_tensorflow.sh)
 RUN cd $HOME/armnn-devenv && \
     git clone https://github.com/tensorflow/tensorflow.git && \
     cd tensorflow && \
     git checkout $($HOME/armnn-devenv/armnn/scripts/get_tensorflow.sh -p)
 
-# Build TF Lite
+# Build 64-bit TF Lite
 RUN cd $HOME/armnn-devenv && \
     curl -LO https://storage.googleapis.com/mirror.tensorflow.org/developer.arm.com/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz && \
-    mkdir tflite-toolchains && \
+    mkdir tflite-toolchains &&\
     tar xvf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C tflite-toolchains && \
     mkdir -p tflite/build && \
     cd tflite/build && \
@@ -146,6 +166,24 @@ RUN cd $HOME/armnn-devenv && \
           $HOME/armnn-devenv/tensorflow/tensorflow/lite/ && \
     cmake --build .
 
+# Build 32-bit TF Lite
+RUN cd $HOME/armnn-devenv && \
+    curl -LO https://storage.googleapis.com/mirror.tensorflow.org/developer.arm.com/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz && \
+    mkdir tflite-toolchains-32 && \
+    tar xf gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz -C tflite-toolchains-32 && \
+    mkdir -p tflite-32/build && \
+    cd tflite-32/build && \
+    ARMCC_PREFIX=$HOME/armnn-devenv/tflite-toolchains-32/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin/arm-linux-gnueabihf- && \
+    ARMCC_FLAGS="-funsafe-math-optimizations" && \
+    cmake -DCMAKE_C_COMPILER=${ARMCC_PREFIX}gcc \
+          -DCMAKE_CXX_COMPILER=${ARMCC_PREFIX}g++ \
+          -DCMAKE_C_FLAGS="${ARMCC_FLAGS}" -DCMAKE_CXX_FLAGS="${ARMCC_FLAGS}" \
+          -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON  -DCMAKE_SYSTEM_NAME=Linux \
+          -DTFLITE_ENABLE_XNNPACK=OFF \
+          -DCMAKE_SYSTEM_PROCESSOR=armv7a \
+          $HOME/armnn-devenv/tensorflow/tensorflow/lite/ && \
+    cmake --build .
+
 # Download Flatbuffers
 RUN cd $HOME/armnn-devenv && \
     wget -O flatbuffers-1.12.0.tar.gz https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz && \
@@ -163,7 +201,7 @@ RUN cd $HOME/armnn-devenv && cd flatbuffers-1.12.0 && \
     make all install -j$(nproc)
 
 # Build arm64 version of Flatbuffers
-RUN cd $HOME/armnn-devenv&& cd flatbuffers-1.12.0  && \
+RUN cd $HOME/armnn-devenv && cd flatbuffers-1.12.0 && \
     mkdir build-arm64 && \
     cd build-arm64 && \
     CXXFLAGS="-fPIC" cmake .. -DCMAKE_C_COMPILER=/usr/bin/aarch64-linux-gnu-gcc \
@@ -173,6 +211,17 @@ RUN cd $HOME/armnn-devenv&& cd flatbuffers-1.12.0  && \
          -DFLATBUFFERS_BUILD_TESTS=0 && \
     make all install -j$(nproc)
 
+# Build arm32 version of Flatbuffers
+RUN cd $HOME/armnn-devenv && cd flatbuffers-1.12.0  && \
+    mkdir build-arm32 && \
+    cd build-arm32 && \
+    CXXFLAGS="-fPIC" cmake .. -DCMAKE_C_COMPILER=/usr/bin/arm-linux-gnueabihf-gcc \
+         -DCMAKE_CXX_COMPILER=/usr/bin/arm-linux-gnueabihf-g++ \
+         -DFLATBUFFERS_BUILD_FLATC=1 \
+         -DCMAKE_INSTALL_PREFIX:PATH=$HOME/armnn-devenv/flatbuffers-arm32 \
+         -DFLATBUFFERS_BUILD_TESTS=0 && \
+    make all install -j$(nproc)
+
 # Build onnx
 RUN cd $HOME/armnn-devenv && git clone https://github.com/onnx/onnx.git && \
     cd onnx && \
@@ -181,13 +230,19 @@ RUN cd $HOME/armnn-devenv && git clone https://github.com/onnx/onnx.git && \
     $HOME/armnn-devenv/google/x86_64_pb_install/bin/protoc \
     onnx/onnx.proto --proto_path=. --proto_path=../google/x86_64_pb_install/include --cpp_out $HOME/armnn-devenv/onnx
 
-# Generate TF Lite Schema
+# Generate TF Lite Schema 64-bit
 RUN cd $HOME/armnn-devenv && \
     cd tflite && \
     cp ../tensorflow/tensorflow/lite/schema/schema.fbs . && \
     ../flatbuffers-1.12.0/build/flatc -c --gen-object-api --reflect-types --reflect-names schema.fbs
 
-# Build ArmNN
+# Generate TF Lite Schema 32-bit
+RUN cd $HOME/armnn-devenv && \
+    cd tflite-32 && \
+    cp ../tensorflow/tensorflow/lite/schema/schema.fbs . && \
+    ../flatbuffers-1.12.0/build/flatc -c --gen-object-api --reflect-types --reflect-names schema.fbs
+
+# Build 64-bit ArmNN
 RUN cd $HOME/armnn-devenv && \
     cd armnn && mkdir build && cd build && \
     export CXX=aarch64-linux-gnu-g++ && \
@@ -211,3 +266,30 @@ RUN cd $HOME/armnn-devenv && \
     -DPROTOBUF_LIBRARY_DEBUG=$HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so.23.0.0 \
     -DPROTOBUF_LIBRARY_RELEASE=$HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so.23.0.0 && \
     make -j$(nproc)
+
+# Build 32-bit ArmNN
+RUN cd $HOME/armnn-devenv && \
+    cd armnn-32 && mkdir build && cd build && \
+    export CXX=arm-linux-gnueabihf-g++ && \
+    export CC=arm-linux-gnueabihf-gcc && \
+    cmake .. \
+    -DCMAKE_CXX_FLAGS=-w \
+    -DBUILD_TESTS=1 \
+    -DARMCOMPUTE_ROOT=$HOME/armnn-devenv/ComputeLibrary_32 \
+    -DARMCOMPUTE_BUILD_DIR=$HOME/armnn-devenv/ComputeLibrary_32/build/ \
+    -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMNNREF=1 \
+    -DONNX_GENERATED_SOURCES=$HOME/armnn-devenv/onnx \
+    -DBUILD_ONNX_PARSER=1 \
+    -DBUILD_TF_LITE_PARSER=1 \
+    -DBUILD_ARMNN_TFLITE_DELEGATE=1 \
+    -DTENSORFLOW_ROOT=$HOME/armnn-devenv/tensorflow \
+    -DTFLITE_LIB_ROOT=$HOME/armnn-devenv/tflite-32/build \
+    -DTF_LITE_SCHEMA_INCLUDE_PATH=$HOME/armnn-devenv/tflite-32 \
+    -DFLATBUFFERS_ROOT=$HOME/armnn-devenv/flatbuffers-arm32 \
+    -DFLATC_DIR=$HOME/armnn-devenv/flatbuffers-1.12.0/build \
+    -DPROTOBUF_ROOT=$HOME/armnn-devenv/google/x86_64_pb_install \
+    -DPROTOBUF_LIBRARY_DEBUG=$HOME/armnn-devenv/google/arm32_pb_install/lib/libprotobuf.so.23.0.0 \
+    -DPROTOBUF_LIBRARY_RELEASE=$HOME/armnn-devenv/google/arm32_pb_install/lib/libprotobuf.so.23.0.0 \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON && \
+    make -j$(nproc)
+