Просмотр исходного кода

Update FPU configuration in spec_test_on_nuttx.yml (#2856)

Huang Qi 2 лет назад
Родитель
Сommit
7308b1eb00
1 измененных файлов с 12 добавлено и 7 удалено
  1. 12 7
      .github/workflows/spec_test_on_nuttx.yml

+ 12 - 7
.github/workflows/spec_test_on_nuttx.yml

@@ -37,32 +37,32 @@ jobs:
           # {
           # {
           #   config: "boards/arm64/qemu/qemu-armv8a/configs/nsh",
           #   config: "boards/arm64/qemu/qemu-armv8a/configs/nsh",
           #   target: "aarch64_vfp",
           #   target: "aarch64_vfp",
-          #   use_fpu: true
+          #   fpu_type: "fp"
           # },
           # },
           # {
           # {
           #   config: "boards/arm/imx6/sabre-6quad/configs/nsh",
           #   config: "boards/arm/imx6/sabre-6quad/configs/nsh",
           #   target: "thumbv7",
           #   target: "thumbv7",
-          #   use_fpu: false
+          #   fpu_type: "none"
           # },
           # },
           {
           {
             config: "boards/arm/imx6/sabre-6quad/configs/nsh",
             config: "boards/arm/imx6/sabre-6quad/configs/nsh",
             target: "thumbv7_vfp",
             target: "thumbv7_vfp",
-            use_fpu: true
+            fpu_type: "dp"
           },
           },
           {
           {
             config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh",
             config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh",
             target: "riscv32",
             target: "riscv32",
-            use_fpu: false
+            fpu_type: "none"
           },
           },
           # {
           # {
           #   config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh",
           #   config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh",
           #   target: "riscv32_ilp32d",
           #   target: "riscv32_ilp32d",
-          #   use_fpu: true
+          #   fpu_type: "dp"
           # },
           # },
           {
           {
             config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh64",
             config: "boards/risc-v/qemu-rv/rv-virt/configs/nsh64",
             target: "riscv64",
             target: "riscv64",
-            use_fpu: false
+            fpu_type: "none"
           },
           },
         ]
         ]
 
 
@@ -165,10 +165,15 @@ jobs:
           find nuttx/boards -name defconfig | xargs sed -i '$a\${{ matrix.wamr_test_option.option }}'
           find nuttx/boards -name defconfig | xargs sed -i '$a\${{ matrix.wamr_test_option.option }}'
 
 
       - name: Disable FPU for NuttX
       - name: Disable FPU for NuttX
-        if: matrix.target_config.use_fpu == false
+        if: matrix.target_config.fpu_type == 'none'
         run: |
         run: |
           find nuttx/boards -name defconfig | xargs sed -i '$a\# CONFIG_ARCH_FPU is not set\n'
           find nuttx/boards -name defconfig | xargs sed -i '$a\# CONFIG_ARCH_FPU is not set\n'
 
 
+      - name: Disable DPFPU for NuttX
+        if: matrix.target_config.fpu_type == 'fp'
+        run: |
+          find nuttx/boards -name defconfig | xargs sed -i '$a\# CONFIG_ARCH_DPFPU is not set\n'
+
       - name: Build wamrc
       - name: Build wamrc
         if: contains(matrix.wamr_test_option.mode, 'aot')
         if: contains(matrix.wamr_test_option.mode, 'aot')
         working-directory: apps/interpreters/wamr/wamr/wamr-compiler
         working-directory: apps/interpreters/wamr/wamr/wamr-compiler