Add support for RZ/G2UL smarc-rzg2ul platform

Signed-off-by: Ayman Chaudhry <ayman.chaudhry.kc@renesas.com>
Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>

.gitlab-ci.yml

@@ -165,6 +165,13 @@ armnn_smarc-rzg2lc_build-and-test:
  CI_CONF_NAME: armnn+tfl
  rules: *build-and-test_rules-manual
 
+armnn_smarc-rzg2ul_build-and-test:
+ extends: [.rzg2l_meta-renesas-ai_test]
+ variables:
+ CI_META_RENESAS_AI_CONFIGURATION: meta-benchmark/templates/armnn+tfl/smarc-rzg2ul
+ CI_CONF_NAME: armnn+tfl
+ rules: *build-and-test_rules-manual
+
 # onnx
 onnx_ek874_build-and-test:
  extends: [.rzg2_meta-renesas-ai_test, .ek874]
@@ -210,6 +217,14 @@ onnx_smarc-rzg2lc_build-and-test:
  CI_CONF_NAME: onnx
  rules: *build-and-test_rules-manual
 
+onnx_smarc-rzg2ul_build-and-test:
+ variables:
+ extends: [.rzg2l_meta-renesas-ai_test]
+ variables:
+ CI_META_RENESAS_AI_CONFIGURATION: meta-benchmark/templates/onnx/smarc-rzg2ul
+ CI_CONF_NAME: onnx
+ rules: *build-and-test_rules-manual
+
 # tflite
 tfl_ek874_build-and-test:
  extends: [.rzg2_meta-renesas-ai_test, .ek874]
@@ -253,6 +268,13 @@ tfl_smarc-rzg2lc_build-and-test:
  CI_CONF_NAME: tflite
  rules: *build-and-test_rules-manual
 
+tfl_smarc-rzg2ul_build-and-test:
+ extends: [.rzg2l_meta-renesas-ai_test]
+ variables:
+ CI_META_RENESAS_AI_CONFIGURATION: meta-benchmark/templates/tflite/smarc-rzg2ul
+ CI_CONF_NAME: tflite
+ rules: *build-and-test_rules-manual
+
 ################################################################################
 # Build only (i.e. don't include meta-cip-tests)
 ################################################################################
@@ -303,6 +325,13 @@ armnn_smarc-rzg2lc_build-only:
  CI_CONF_NAME: armnn
  rules: *build-only_rules
 
+armnn_smarc-rzg2ul_build-only:
+ extends: [.rzg2l_meta-renesas-ai_release]
+ variables:
+ CI_META_RENESAS_AI_CONFIGURATION: meta-armnn/templates/smarc-rzg2ul
+ CI_CONF_NAME: armnn
+ rules: *build-only_rules
+
 # onnxruntime
 onnxruntime_ek874_build-only:
  extends: [.rzg2_meta-renesas-ai_release, .ek874]
@@ -346,6 +375,13 @@ onnxruntime_smarc-rzg2lc_build-only:
  CI_CONF_NAME: onnxruntime
  rules: *build-only_rules
 
+onnxruntime_smarc-rzg2ul_build-only:
+ extends: [.rzg2l_meta-renesas-ai_release]
+ variables:
+ CI_META_RENESAS_AI_CONFIGURATION: meta-onnxruntime/templates/smarc-rzg2ul
+ CI_CONF_NAME: onnxruntime
+ rules: *build-only_rules
+
 # tensorflow-lite
 tensorflow-lite_ek874_build-only:
  extends: [.rzg2_meta-renesas-ai_release, .ek874]
@@ -390,3 +426,11 @@ tensorflow-lite_smarc-rzg2lc_build-only:
  CI_META_RENESAS_AI_CONFIGURATION: meta-tensorflow-lite/templates/smarc-rzg2lc
  CI_CONF_NAME: tensorflow-lite
  rules: *build-only_rules
+
+tensorflow-lite_smarc-rzg2ul_build-only:
+ extends: [.rzg2l_meta-renesas-ai_release]
+ variables:
+ variables:
+ CI_META_RENESAS_AI_CONFIGURATION: meta-tensorflow-lite/templates/smarc-rzg2ul
+ CI_CONF_NAME: tensorflow-lite
+ rules: *build-only_rules

README.md

@@ -36,13 +36,13 @@ in the [Licensing](#licensing) section.
 
 ### Supported Frameworks/Versions ###
 
-| Framework | Version | Parser(s) | Inference Hardware |
-| :-------------------------------- | :-------- | :---------------------------------------- | :----------------- |
-| ArmNN | v21.05 | ONNX (v1.6.0)<br>TensorFlow Lite (v2.3.1) | CPU |
-| ArmNN (smarc-rzg2l, smarc-rzg2lc) | v22.02 | ONNX (v1.6.0)<br>TensorFlow Lite (v2.5.3) | CPU<br>GPU |
-| ONNX Runtime | v1.8.0 | ONNX | CPU |
-| TensorFlow Lite | v2.3.1 | TensorFlow Lite | CPU |
-| TensorFlow Lite | v2.5.3 | TensorFlow Lite | CPU |
+| Framework  | Version | Parser(s) | Inference Hardware |
+| :---------------------------------------------- | :-------- | :---------------------------------------- | :----------------- |
+| ArmNN  | v21.05 | ONNX (v1.6.0)<br>TensorFlow Lite (v2.3.1) | CPU |
+| ArmNN (smarc-rzg2l, smarc-rzg2lc, smarc-rzg2ul) | v22.02 | ONNX (v1.6.0)<br>TensorFlow Lite (v2.5.3) | CPU<br>GPU |
+| ONNX Runtime  | v1.8.0 | ONNX | CPU |
+| TensorFlow Lite  | v2.3.1 | TensorFlow Lite | CPU |
+| TensorFlow Lite  | v2.5.3 | TensorFlow Lite | CPU |
 
 ### Supported Embedded Platforms ###
 
@@ -54,6 +54,7 @@ in the [Licensing](#licensing) section.
 | Renesas RZ/G2E | Silicon Linux ek874 |
 | Renesas RZ/G2L | Renesas smarc-rzg2l evk |
 | Renesas RZ/G2LC | Renesas smarc-rzg2lc evk |
+| Renesas RZ/G2UL | Renesas smarc-rzg2ul evk |
 
 ### Build Script ###
 A simple build script has been created to manage the build process. 

meta-armnn/conf/layer.conf

@@ -15,14 +15,17 @@ LAYERSERIES_COMPAT_armnn-layer = "rocko dunfell"
 PREFERRED_VERSION_arm-compute-library ?= "21.05%"
 PREFERRED_VERSION_armnn_smarc-rzg2l ?= "22.02%"
 PREFERRED_VERSION_armnn_smarc-rzg2lc ?= "22.02%"
+PREFERRED_VERSION_armnn_smarc-rzg2ul ?= "22.02%"
 PREFERRED_VERSION_armnn ?= "21.05%"
 PREFERRED_VERSION_arm-compute-library_smarc-rzg2l ?= "22.02%"
 PREFERRED_VERSION_arm-compute-library_smarc-rzg2lc ?= "22.02%"
+PREFERRED_VERSION_arm-compute-library_smarc-rzg2ul ?= "22.02%"
 PREFERRED_VERSION_arm-compute-library ?= "21.05%"
 PREFERRED_VERSION_protobuf-native ?= "3.12.4%"
 PREFERRED_VERSION_protobuf ?= "3.12.4%"
 PREFERRED_VERSION_boost ?= "1.64.0%"
 PREFERRED_VERSION_flatbuffers ?= "1.12.0%"
 PREFERRED_VERSION_tensorflow-lite_smarc-rzg2l ?= "2.5.3%"
 PREFERRED_VERSION_tensorflow-lite_smarc-rzg2lc ?= "2.5.3%"
+PREFERRED_VERSION_tensorflow-lite_smarc-rzg2ul ?= "2.5.3%"
 PREFERRED_VERSION_tensorflow-lite ?= "2.3.1"

meta-armnn/recipes-mathematics/arm-compute-library/arm-compute-library_21.05.bb

@@ -20,7 +20,7 @@ SRC_URI = " \
  file://0001-Add-code-to-detect-Mali-TM-G31.patch \
 "
 
-COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc)"
+COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc|smarc-rzg2ul)"
 
 S = "${WORKDIR}/git"
 

meta-armnn/recipes-mathematics/arm-compute-library/arm-compute-library_22.02.bb

@@ -19,7 +19,7 @@ SRC_URI = " \
  file://0001-Add-support-for-building-aarch64-CL-with-Scons.patch \
 "
 
-COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc)"
+COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc|smarc-rzg2ul)"
 
 S = "${WORKDIR}/git"
 

meta-armnn/recipes-mathematics/armnn/armnn_21.05.bb

@@ -17,7 +17,7 @@ PACKAGES += "${PN}-tensorflow-lite \
  ${PN}-examples ${PN}-examples-dbg \
 "
 
-COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc)"
+COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc|smarc-rzg2ul)"
 
 inherit PyHelper
 

meta-armnn/recipes-mathematics/armnn/armnn_22.02.bb

@@ -19,7 +19,7 @@ PACKAGES += " \
  ${PN}-examples-dbg \
 "
 
-COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc)"
+COMPATIBLE_MACHINE = "(hihope-rzg2h|hihope-rzg2m|hihope-rzg2n|ek874|smarc-rzg2l|smarc-rzg2lc|smarc-rzg2ul)"
 
 inherit cmake PyHelper
 

meta-armnn/templates/smarc-rzg2ul/bblayers.conf

@@ -0,0 +1,29 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+QT_LAYER = "${@os.path.isdir("${TOPDIR}/../meta-qt5")}"
+RZ_FEATURE = "${@os.path.isdir("${TOPDIR}/../meta-rz-features")}"
+IS_VIRTUALIZATION_LAYER = "${@os.path.isdir("${TOPDIR}/../meta-virtualization")}"
+
+BBLAYERS ?= " \
+ ${TOPDIR}/../meta-gplv2 \
+ ${TOPDIR}/../poky/meta \
+ ${TOPDIR}/../poky/meta-poky \
+ ${TOPDIR}/../poky/meta-yocto-bsp \
+ ${TOPDIR}/../meta-rzg2 \
+ ${TOPDIR}/../meta-openembedded/meta-oe \
+ ${TOPDIR}/../meta-openembedded/meta-python \
+ ${TOPDIR}/../meta-openembedded/meta-multimedia \
+ ${TOPDIR}/../meta-openembedded/meta-networking \
+ ${TOPDIR}/../meta-openembedded/meta-filesystems \
+ ${@'${TOPDIR}/../meta-qt5' if '${QT_LAYER}' == 'True' else ''} \
+ ${@'${TOPDIR}/../meta-rz-features' if '${RZ_FEATURE}' == 'True' else ''} \
+ ${@'${TOPDIR}/../meta-virtualization' if '${IS_VIRTUALIZATION_LAYER}' == 'True' else ''} \
+ ${TOPDIR}/../meta-renesas-ai/meta-rzg-ai \
+ ${TOPDIR}/../meta-renesas-ai/meta-armnn \
+ ${TOPDIR}/../meta-renesas-ai/meta-tensorflow-lite \
+ "