tests: fpu_sharing: Enable support for Cortex-R

Reuse the Cortex-M paths for testing the floating point unit.

Signed-off-by: Bradley Bolen <[email protected]>

Author: Bradley Bolen

tests/kernel/fpu_sharing/float_disable/testcase.yaml

@@ -1,7 +1,7 @@
 tests:
   kernel.fpu_sharing.float_disable.arm:
     arch_allow: arm
-    filter: CONFIG_ARMV7_M_ARMV8_M_FP
+    filter: CONFIG_ARMV7_M_ARMV8_M_FP or CONFIG_ARMV7_R_FP
     extra_configs:
       - CONFIG_DYNAMIC_INTERRUPTS=y
     tags: fpu kernel userspace

tests/kernel/fpu_sharing/generic/src/float_context.h

@@ -63,7 +63,7 @@ struct fp_non_volatile_register_set {
 #define SIZEOF_FP_VOLATILE_REGISTER_SET sizeof(struct fp_volatile_register_set)
 #define SIZEOF_FP_NON_VOLATILE_REGISTER_SET 0
 
-#elif defined(CONFIG_ARMV7_M_ARMV8_M_FP)
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_FP) || defined(CONFIG_ARMV7_R_FP)
 
 #define FP_OPTION 0
 

tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h

@@ -1,6 +1,6 @@
 /**
  * @file
- * @brief ARM Cortex-M4 GCC specific floating point register macros
+ * @brief ARM GCC specific floating point register macros
  */
 
 /*
@@ -12,8 +12,9 @@
 #ifndef _FLOAT_REGS_ARM_GCC_H
 #define _FLOAT_REGS_ARM_GCC_H
 
-#if !defined(__GNUC__) || !defined(CONFIG_ARMV7_M_ARMV8_M_FP)
-#error __FILE__ goes only with Cortex-M GCC
+#if !defined(__GNUC__) \
+	|| !(defined(CONFIG_ARMV7_M_ARMV8_M_FP) || defined(CONFIG_ARMV7_R_FP))
+#error __FILE__ goes only with ARM GCC
 #endif
 
 #include <toolchain.h>

tests/kernel/fpu_sharing/generic/src/load_store.c

@@ -44,7 +44,7 @@
 #else
 #include "float_regs_x86_other.h"
 #endif /* __GNUC__ */
-#elif defined(CONFIG_ARMV7_M_ARMV8_M_FP)
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_FP) || defined(CONFIG_ARMV7_R_FP)
 #if defined(__GNUC__)
 #include "float_regs_arm_gcc.h"
 #else
@@ -191,7 +191,7 @@ static void load_store_low(void)
 		 * disable floating point operations for the task.
 		 */
 #if (defined(CONFIG_X86) && defined(CONFIG_LAZY_FPU_SHARING)) || \
-		defined(CONFIG_ARMV7_M_ARMV8_M_FP)
+		defined(CONFIG_ARMV7_M_ARMV8_M_FP) || defined(CONFIG_ARMV7_R_FP)
 		/*
 		 * In x86:
 		 * The subsequent execution of _load_all_float_registers() will

tests/kernel/fpu_sharing/generic/testcase.yaml

@@ -8,7 +8,7 @@ tests:
     min_ram: 16
   kernel.fpu_sharing.generic.arm:
     extra_args: PI_NUM_ITERATIONS=70000
-    filter: CONFIG_ARMV7_M_ARMV8_M_FP
+    filter: CONFIG_ARMV7_M_ARMV8_M_FP or CONFIG_ARMV7_R_FP
     slow: true
     tags: fpu kernel
     timeout: 600