feat(ls64): add run parameter to support FEAT_LS64 tests
* FEAT_LS64* extensions can be enabled by setting
clusterX.arm_v8_7_accelerator_support_level parameter.
* This patch adds the parameter to base-aemva-common model,
so the parameter can be set in run scripts.
* In addition, parameter bp.ls64_testing_fifo.op_type is set
automatically to 0 when FEAT_LS64* extension is enabled.
Signed-off-by: Juan Pablo Conde <juanpablo.conde@arm.com>
Change-Id: I4fa824d15352dd5b80c387943e29ab960df63c3b
Signed-off-by: Jayanth Dodderi Chidanand <jayanthdodderi.chidanand@arm.com>
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index f1a5389..8421dd7 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -103,6 +103,10 @@
# CRC32 support
reset_var supports_crc32
+# Accelerator instruction support level (none, FEAT_LS64,
+# FEAT_LS64_V, FEAT_LS64_ACCDATA)
+reset_var accelerator_support_level
+
source "$ci_root/model/fvp_common.sh"
#------------ Common configuration --------------
@@ -163,6 +167,14 @@
EOF
fi
+# If accelerator support level enabled, disable bitwise negation
+# for values stored/read using FEAT_LS64* instructions.
+if [ "$accelerator_support_level" != "0" ]; then
+ cat <<EOF >>"$model_param_file"
+-C bp.ls64_testing_fifo.op_type=0
+EOF
+fi
+
#------------ Cluster0 configuration --------------
cat <<EOF >>"$model_param_file"
@@ -414,6 +426,13 @@
EOF
fi
+# Accelerator support level enabled
+if [ "$accelerator_support_level" != "0" ]; then
+ cat <<EOF >>"$model_param_file"
+-C cluster0.arm_v8_7_accelerator_support_level=1
+EOF
+fi
+
#------------ Cluster1 configuration (if exists) --------------
if [ "$is_dual_cluster" = "1" ]; then
cat <<EOF >>"$model_param_file"
@@ -579,6 +598,13 @@
EOF
fi
+# Accelerator support level enabled
+if [ "$accelerator_support_level" != "0" ]; then
+ cat <<EOF >>"$model_param_file"
+-C cluster1.arm_v8_7_accelerator_support_level=1
+EOF
+fi
+
fi
# 48bit PA size: in order to access memory in high address ranges the
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index ab693f6..5d9fef6 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -27,6 +27,7 @@
supports_trace_filter_regs="2" \
supports_system_trace_filter_regs="1" \
arch_version="8.9" \
+ accelerator_support_level="1" \
gen_model_params
model="$model" gen_fvp_yaml