chore: move plugins to access from model dir
Remove access and setup of plugins from public downloads area.
Assume all plugins are present with model binaries.
Currently with RevC model we are using two plugins
- ETMv4ExamplePlugin.so
- GenericTrace.so
A new RevC model package FVP_Base_RevC-2xAEMvA_11.28_23_Linux64.tgz
has been uploaded this package contains both the plugins in plugins
directory.
Change-Id: I0e0f2dd014b6cfa8b6bfa0556db15715814bd9b4
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 61a5533..0158f95 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -10,6 +10,7 @@
set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
+ default_var generictrace_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/GenericTrace.so"
default_var bmcov_plugin_path "$workspace/artefacts/${bin_mode:?}/coverage_trace.so"
else
@@ -21,8 +22,8 @@
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 etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
+ default_var etm_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/ETMv4ExamplePlugin.so"
+ default_var generictrace_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/GenericTrace.so"
fi
default_var is_dual_cluster 1
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 67f11e3..febe889 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -304,7 +304,7 @@
-C pci.tbu0_pre_smmu_logger.trace_debug=1
-C pci.pci_smmuv3.mmu.all_error_messages_through_trace=1
-C TRACE.GenericTrace.trace-sources=verbose_commentary,smmu_initial_transaction,smmu_final_transaction,*.pci.pci_smmuv3.mmu.*,*.pci.smmulogger.*,*.pci.tbu0_pre_smmu_logger.*,smmu_poison_tw_data
---plugin $warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/GenericTrace.so
+--plugin $generictrace_plugin_path
-C cci550.force_on_from_start=1
EOF
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index 6f52278..29b34e3 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -10,6 +10,7 @@
set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
+ default_var generictrace_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/GenericTrace.so"
else
# OpenCI enviroment
source "$ci_root/fvp_utils.sh"
@@ -19,8 +20,8 @@
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 etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
+ default_var etm_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/ETMv4ExamplePlugin.so"
+ default_var generictrace_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/GenericTrace.so"
fi
default_var is_dual_cluster 1