Skip to content

Commit a9c26d6

Browse files
The testing github action is improved with support for more compilers. (ARM-software#184)
Testing github action with support for AC6, gcc, clang
1 parent c414ac5 commit a9c26d6

File tree

79 files changed

+10378
-3132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+10378
-3132
lines changed

.github/workflows/runtest.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ permissions:
1212

1313
jobs:
1414
CI_test_run:
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
compiler: [AC6, CLANG, GCC]
1519
runs-on: ubuntu-latest
1620

1721
steps:
@@ -30,6 +34,8 @@ jobs:
3034
3135
- name: Activate vcpkg
3236
uses: ARM-software/cmsis-actions/vcpkg@v1
37+
with:
38+
cache: "-${{ matrix.compiler }}"
3339

3440
- name: Activate Arm tool license
3541
uses: ARM-software/cmsis-actions/armlm@v1
@@ -59,7 +65,7 @@ jobs:
5965
cd cmsis_build
6066
6167
echo "Load missing pack"
62-
csolution list packs -s test_ac6.csolution.yml -m > required_packs.txt
68+
csolution list packs -s test.csolution.yml -m > required_packs.txt
6369
6470
cat required_packs.txt
6571
cpackget add -a -f required_packs.txt
@@ -69,18 +75,18 @@ jobs:
6975
cd Testing/cmsis_build
7076
echo "Running tests"
7177
72-
python runall.py -avh $AVH_FVP_PLUGINS/../bin
78+
python runall.py -s -g ${{ matrix.compiler }} -avh $AVH_FVP_PLUGINS/../bin
7379
7480
- name: Upload test report
7581
uses: actions/upload-artifact@v4
7682
with:
77-
name: test-report
78-
path: Testing/cmsis_build/summary.html
83+
name: test-report_${{ matrix.compiler }}
84+
path: Testing/cmsis_build/summary_${{ matrix.compiler }}.html
7985

8086

8187
- name: Check error
8288
run: |
8389
cd Testing/cmsis_build
8490
8591
echo "Checking output..."
86-
test "$(grep "Error" summary.html | wc -l)" -eq 0
92+
test "$(grep "Error" summary_${{ matrix.compiler }}.html | wc -l)" -eq 0

Include/arm_math_types.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,19 @@ extern "C"
4040
#elif defined ( __APPLE_CC__ )
4141
#pragma GCC diagnostic ignored "-Wold-style-cast"
4242

43+
#elif defined(__clang__)
44+
#pragma GCC diagnostic push
45+
#pragma GCC diagnostic ignored "-Wsign-conversion"
46+
#pragma GCC diagnostic ignored "-Wconversion"
47+
#pragma GCC diagnostic ignored "-Wunused-parameter"
48+
4349
#elif defined ( __GNUC__ )
4450
#pragma GCC diagnostic push
4551
#pragma GCC diagnostic ignored "-Wsign-conversion"
4652
#pragma GCC diagnostic ignored "-Wconversion"
4753
#pragma GCC diagnostic ignored "-Wunused-parameter"
54+
// Disable some code having issue with GCC
55+
#define __CMSIS_GCC_H
4856

4957
#elif defined ( __ICCARM__ )
5058

Testing/FrameworkInclude/Timing.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef _TIMING_H_
22
#define _TIMING_H_
33

4+
#include "RTE_Components.h"
5+
#include CMSIS_device_header
6+
47
#include "Test.h"
58
#include "arm_math_types.h"
69
#include "arm_math_types_f16.h"

Testing/FrameworkSource/Error.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "arm_math_types.h"
3131
#include "arm_math_types_f16.h"
3232
#include "Error.h"
33-
33+
#include <cinttypes>
3434

3535
namespace Client {
3636

Testing/FrameworkSource/Timing.cpp

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,7 @@
44

55
#define SYSTICK_INITIAL_VALUE 0x0FFFFFF
66
static uint32_t startCycles=0;
7-
8-
#if defined ARMCM0
9-
#include "ARMCM0.h"
10-
#elif defined ARMCM0P
11-
#include "ARMCM0plus.h"
12-
#elif defined ARMCM0P_MPU
13-
#include "ARMCM0plus_MPU.h"
14-
#elif defined ARMCM3
15-
#include "ARMCM3.h"
16-
#elif defined ARMCM4
17-
#include "ARMCM4.h"
18-
#elif defined ARMCM4_FP
19-
#include "ARMCM4_FP.h"
20-
#elif defined ARMCM7
21-
#include "ARMCM7.h"
22-
#elif defined ARMCM7_SP
23-
#include "ARMCM7_SP.h"
24-
#elif defined ARMCM7_DP
25-
#include "ARMCM7_DP.h"
26-
#elif defined (ARMCM33)
27-
#include "ARMCM33.h"
28-
#elif defined (ARMCM33_DSP_FP)
29-
#include "ARMCM33_DSP_FP.h"
30-
#elif defined (ARMCM33_DSP_FP_TZ)
31-
#include "ARMCM33_DSP_FP_TZ.h"
32-
#elif defined ARMSC000
33-
#include "ARMSC000.h"
34-
#elif defined ARMSC300
35-
#include "ARMSC300.h"
36-
#elif defined ARMv8MBL
37-
#include "ARMv8MBL.h"
38-
#elif defined ARMv8MML
39-
#include "ARMv8MML.h"
40-
#elif defined ARMv8MML_DSP
41-
#include "ARMv8MML_DSP.h"
42-
#elif defined ARMv8MML_SP
43-
#include "ARMv8MML_SP.h"
44-
#elif defined ARMv8MML_DSP_SP
45-
#include "ARMv8MML_DSP_SP.h"
46-
#elif defined ARMv8MML_DP
47-
#include "ARMv8MML_DP.h"
48-
#elif defined ARMv8MML_DSP_DP
49-
#include "ARMv8MML_DSP_DP.h"
50-
#elif defined ARMv81MML_DSP_DP_MVE_FP
51-
#include "ARMv81MML_DSP_DP_MVE_FP.h"
52-
#elif defined ARMCM55
53-
#include "ARMCM55.h"
54-
#elif defined ARMCM85
55-
#include "ARMCM85.h"
56-
#elif defined SSE300MPS3
57-
#include "SSE300MPS3.h"
58-
#elif defined ARMv7A
59-
/* TODO */
60-
#else
61-
#define NOTIMING
627
#endif
63-
#endif /* CORTEXM*/
648

659
#if defined(CORTEXA) || defined(CORTEXR)
6610
#if !defined(__GNUC_PYTHON__)

Testing/cmsis_build/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ results*.txt
44
*.cbuild.yml
55
*.cbuild-idx.yml
66
disasm.s
7+
cprj/

0 commit comments

Comments
 (0)