model/base-aemv8a.sh: set correct ScalableVectorExtension for Open CI
With the Open CI alignment taking place, we need to start picking
either arm-warehouse or Open CI model dependencies based on the CI
environment. This patch targets only the ScalableVerctorExtension.so
library, selecting the right one depending on the environment.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: I6027bcab7a3f3545b237dad765061f6d4b06c3c2
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 90700a5..2c4de1d 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -6,9 +6,21 @@
#
# Use revc model
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_RevC-2xAEMv8A"
+if is_arm_jenkins_env; then
+ set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_RevC-2xAEMv8A"
+ default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
+else
+ # OpenCI enviroment
+ source "$ci_root/fvp_utils.sh"
-default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
+ # fvp_models variable contains the information for FVP paths, where 2nd field
+ # points to the /opt/model/*/models/${model_flavour}
+ models_dir="$(echo ${fvp_models[$model]} | awk -F ';' '{print $2}')"
+ set_model_path "$models_dir"
+
+ # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
+ default_var sve_plugin_path "${models_dir/models/plugins}/ScalableVectorExtension.so"
+fi
default_var is_dual_cluster 1