From 3591ee64ac6e9a22b88d14c3d47c7e13177217ce Mon Sep 17 00:00:00 2001 From: Jonatan Antoni Date: Tue, 10 Oct 2023 16:18:38 +0200 Subject: [PATCH] Fixup --- .devcontainer/ubuntu-22.04/Dockerfile | 28 ++++++++++++++++++++ .devcontainer/ubuntu-22.04/devcontainer.json | 13 +++++++++ .github/workflows/core.yml | 9 ++++--- CMSIS/Core/Test/apsr.c | 2 +- CMSIS/Core/Test/basepri.c | 2 +- CMSIS/Core/Test/bkpt.c | 4 +-- CMSIS/Core/Test/build.py | 2 ++ CMSIS/Core/Test/clrex.c | 2 +- CMSIS/Core/Test/clz.c | 2 +- CMSIS/Core/Test/control.c | 2 +- CMSIS/Core/Test/dmb.c | 2 +- CMSIS/Core/Test/dsb.c | 2 +- CMSIS/Core/Test/fault_irq.c | 2 +- CMSIS/Core/Test/faultmask.c | 2 +- CMSIS/Core/Test/fpscr_nofp.c | 2 +- CMSIS/Core/Test/ipsr.c | 2 +- CMSIS/Core/Test/irq.c | 2 +- CMSIS/Core/Test/isb.c | 2 +- CMSIS/Core/Test/lda.c | 2 +- CMSIS/Core/Test/ldaex.c | 2 +- CMSIS/Core/Test/ldrex.c | 2 +- CMSIS/Core/Test/ldrt.c | 2 +- CMSIS/Core/Test/lit.cfg.py | 10 +++++-- CMSIS/Core/Test/msp.c | 2 +- CMSIS/Core/Test/nop.c | 2 +- CMSIS/Core/Test/noreturn.c | 2 +- CMSIS/Core/Test/primask.c | 2 +- CMSIS/Core/Test/psp.c | 2 +- CMSIS/Core/Test/psplim_baseline.c | 2 +- CMSIS/Core/Test/rbit.c | 2 +- CMSIS/Core/Test/rev.c | 2 +- CMSIS/Core/Test/rev16.c | 2 +- CMSIS/Core/Test/revsh.c | 2 +- CMSIS/Core/Test/ror.c | 2 +- CMSIS/Core/Test/rrx.c | 2 +- CMSIS/Core/Test/sev.c | 2 +- CMSIS/Core/Test/simd.c | 8 +++--- CMSIS/Core/Test/sp_ns.c | 2 +- CMSIS/Core/Test/ssat.c | 2 +- CMSIS/Core/Test/stl.c | 2 +- CMSIS/Core/Test/stlex.c | 2 +- CMSIS/Core/Test/strex.c | 2 +- CMSIS/Core/Test/strt.c | 2 +- CMSIS/Core/Test/systick.c | 2 +- CMSIS/Core/Test/usat.c | 2 +- CMSIS/Core/Test/vcpkg-configuration.json | 3 +-- CMSIS/Core/Test/wfi.c | 2 +- CMSIS/Core/Test/xpsr.c | 2 +- 48 files changed, 103 insertions(+), 54 deletions(-) create mode 100644 .devcontainer/ubuntu-22.04/Dockerfile create mode 100644 .devcontainer/ubuntu-22.04/devcontainer.json diff --git a/.devcontainer/ubuntu-22.04/Dockerfile b/.devcontainer/ubuntu-22.04/Dockerfile new file mode 100644 index 000000000..b444e0647 --- /dev/null +++ b/.devcontainer/ubuntu-22.04/Dockerfile @@ -0,0 +1,28 @@ +FROM --platform=linux/amd64 ubuntu:22.04 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get -y install \ + build-essential \ + curl \ + gdb \ + less \ + python3 \ + python3-pip \ + python-is-python3 \ + git \ + libtinfo5 \ + llvm-15 \ + llvm-15-tools \ + unzip && \ + ln -s /usr/bin/FileCheck-15 /usr/bin/FileCheck && \ + ln -s /usr/bin/llvm-objdump-15 /usr/bin/llvm-objdump + +RUN curl -sLO https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz && \ + tar -xvf LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz && \ + rm LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz && \ + mv LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64 /opt/arm-none-eabi-clang-17.0.1 + +ENV CLANG_TOOLCHAIN_17_0_1=/opt/arm-none-eabi-clang-17.0.1/bin + +CMD ["/bin/bash"] diff --git a/.devcontainer/ubuntu-22.04/devcontainer.json b/.devcontainer/ubuntu-22.04/devcontainer.json new file mode 100644 index 000000000..f437b911b --- /dev/null +++ b/.devcontainer/ubuntu-22.04/devcontainer.json @@ -0,0 +1,13 @@ +{ + "name": "Ubuntu-22.04", + "build": { "dockerfile": "Dockerfile" }, + + "customizations": { + "vscode": { + "extensions": [ + "ms-vscode.cpptools", + "ms-vscode.cpptools-extension-pack" + ] + } + } + } diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index a9765b494..d19aed018 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -49,13 +49,14 @@ jobs: working-directory: /home/runner run: | sudo apt-get update - sudo apt-get install libtinfo5 llvm-15-tools + sudo apt-get install libtinfo5 llvm-15 llvm-15-tools + sudo ln -s /usr/bin/llvm-objdump-15 /usr/bin/llvm-objdump sudo ln -s /usr/bin/FileCheck-15 /usr/bin/FileCheck if [[ ! -d LLVMEmbeddedToolchainForArm-17.0.0-Linux-x86_64 ]]; then - wget https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/preview-17.0.0-devdrop0/LLVMEmbeddedToolchainForArm-17.0.0-Linux-x86_64.tar.xz - tar -xf LLVMEmbeddedToolchainForArm-17.0.0-Linux-x86_64.tar.xz + wget https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz + tar -xf LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz fi - ./LLVMEmbeddedToolchainForArm-17.0.0-Linux-x86_64/bin/clang --version + ./LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64/bin/clang --version echo "CLANG_TOOLCHAIN_17_0_0=$(pwd)/LLVMEmbeddedToolchainForArm-17.0.0-Linux-x86_64/bin" >> $GITHUB_ENV - name: Prepare vcpkg env diff --git a/CMSIS/Core/Test/apsr.c b/CMSIS/Core/Test/apsr.c index 4734d1658..459a87260 100644 --- a/CMSIS/Core/Test/apsr.c +++ b/CMSIS/Core/Test/apsr.c @@ -1,5 +1,5 @@ // REQUIRES: thumbv6m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/basepri.c b/CMSIS/Core/Test/basepri.c index 66251b015..f094b5b8e 100644 --- a/CMSIS/Core/Test/basepri.c +++ b/CMSIS/Core/Test/basepri.c @@ -1,5 +1,5 @@ // REQUIRES: thumb-2, thumbv7m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/bkpt.c b/CMSIS/Core/Test/bkpt.c index 76e9b6b35..ef1b2a33d 100644 --- a/CMSIS/Core/Test/bkpt.c +++ b/CMSIS/Core/Test/bkpt.c @@ -1,10 +1,10 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" void bkpt() { // CHECK-LABEL: : - // CHECK: bkpt #0x15 + // CHECK: bkpt {{#0x15|#21}} __BKPT(0x15); // CHECK: bx lr } diff --git a/CMSIS/Core/Test/build.py b/CMSIS/Core/Test/build.py index e027c4e9d..38def839b 100755 --- a/CMSIS/Core/Test/build.py +++ b/CMSIS/Core/Test/build.py @@ -29,8 +29,10 @@ class DeviceAxis(Enum): CM35P = ('Cortex-M35P', 'CM35P') CM35PS = ('Cortex-M35PS', 'CM35PS') CM35PNS = ('Cortex-M35PNS', 'CM35PNS') + CM55 = ('Cortex-M55', 'CM55') CM55S = ('Cortex-M55S', 'CM55S') CM55NS = ('Cortex-M55NS', 'CM55NS') + CM85 = ('Cortex-M85', 'CM85') CM85S = ('Cortex-M85S', 'CM85S') CM85NS = ('Cortex-M85NS', 'CM85NS') CA5 = ('Cortex-A5', 'CA5') diff --git a/CMSIS/Core/Test/clrex.c b/CMSIS/Core/Test/clrex.c index e1eb3f9f9..397663ca2 100644 --- a/CMSIS/Core/Test/clrex.c +++ b/CMSIS/Core/Test/clrex.c @@ -1,5 +1,5 @@ // REQUIRES: ldrex -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/clz.c b/CMSIS/Core/Test/clz.c index 6ac37b5c4..0f4892997 100644 --- a/CMSIS/Core/Test/clz.c +++ b/CMSIS/Core/Test/clz.c @@ -1,5 +1,5 @@ // REQUIRES: clz -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/control.c b/CMSIS/Core/Test/control.c index af87bc2dd..6e5d2d10c 100644 --- a/CMSIS/Core/Test/control.c +++ b/CMSIS/Core/Test/control.c @@ -1,5 +1,5 @@ // REQUIRES: thumbv6m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/dmb.c b/CMSIS/Core/Test/dmb.c index d818eee69..f5652ef1a 100644 --- a/CMSIS/Core/Test/dmb.c +++ b/CMSIS/Core/Test/dmb.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/dsb.c b/CMSIS/Core/Test/dsb.c index a16e8a9c1..33705adf5 100644 --- a/CMSIS/Core/Test/dsb.c +++ b/CMSIS/Core/Test/dsb.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/fault_irq.c b/CMSIS/Core/Test/fault_irq.c index e27426ede..4ead687de 100644 --- a/CMSIS/Core/Test/fault_irq.c +++ b/CMSIS/Core/Test/fault_irq.c @@ -1,5 +1,5 @@ // REQUIRES: thumb-2 -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/faultmask.c b/CMSIS/Core/Test/faultmask.c index 0e4388a96..c6146bd15 100644 --- a/CMSIS/Core/Test/faultmask.c +++ b/CMSIS/Core/Test/faultmask.c @@ -1,5 +1,5 @@ // REQUIRES: thumb-2, thumbv7m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/fpscr_nofp.c b/CMSIS/Core/Test/fpscr_nofp.c index f7e75ce57..7298c37a3 100644 --- a/CMSIS/Core/Test/fpscr_nofp.c +++ b/CMSIS/Core/Test/fpscr_nofp.c @@ -6,7 +6,7 @@ void get_fpscr() { // CHECK-LABEL: : // CHECK-NOT: vmrs {{r[0-9]+}}, fpscr - // CHECK: movs {{r[0-9]+}}, #0x0 + // CHECK: movs {{r[0-9]+}}, #0 volatile uint32_t result = __get_FPSCR(); // CHECK: bx lr } diff --git a/CMSIS/Core/Test/ipsr.c b/CMSIS/Core/Test/ipsr.c index b55a6322f..96f7dd3b1 100644 --- a/CMSIS/Core/Test/ipsr.c +++ b/CMSIS/Core/Test/ipsr.c @@ -1,6 +1,6 @@ // REQUIRES: thumbv6m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/irq.c b/CMSIS/Core/Test/irq.c index cde432b95..ed79c6e6f 100644 --- a/CMSIS/Core/Test/irq.c +++ b/CMSIS/Core/Test/irq.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/isb.c b/CMSIS/Core/Test/isb.c index 3590c9643..53efd6a06 100644 --- a/CMSIS/Core/Test/isb.c +++ b/CMSIS/Core/Test/isb.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/lda.c b/CMSIS/Core/Test/lda.c index a179e0ba5..712ba6499 100644 --- a/CMSIS/Core/Test/lda.c +++ b/CMSIS/Core/Test/lda.c @@ -1,5 +1,5 @@ // REQUIRES: armv8m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/ldaex.c b/CMSIS/Core/Test/ldaex.c index 559ac4c67..564b2f3f6 100644 --- a/CMSIS/Core/Test/ldaex.c +++ b/CMSIS/Core/Test/ldaex.c @@ -1,5 +1,5 @@ // REQUIRES: armv8m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/ldrex.c b/CMSIS/Core/Test/ldrex.c index 4b5681979..e6861d8a2 100644 --- a/CMSIS/Core/Test/ldrex.c +++ b/CMSIS/Core/Test/ldrex.c @@ -1,5 +1,5 @@ // REQUIRES: ldrex -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/ldrt.c b/CMSIS/Core/Test/ldrt.c index c6bde82fc..32234d6e0 100644 --- a/CMSIS/Core/Test/ldrt.c +++ b/CMSIS/Core/Test/ldrt.c @@ -1,6 +1,6 @@ // REQUIRES: thumb-2 -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/lit.cfg.py b/CMSIS/Core/Test/lit.cfg.py index a511b4220..8778f2e54 100644 --- a/CMSIS/Core/Test/lit.cfg.py +++ b/CMSIS/Core/Test/lit.cfg.py @@ -8,7 +8,7 @@ DEVICES = { 'CM0': { 'arch': 'thumbv6m', - 'triple': 'thumbv6-m', + 'triple': 'thumbv6m', 'abi': 'eabi', 'mcpu': 'Cortex-M0', 'mfpu': 'none', @@ -23,7 +23,7 @@ }, 'CM0plus': { 'arch': 'thumbv6m', - 'triple': 'thumbv6-m', + 'triple': 'thumbv6m', 'abi': 'eabi', 'mcpu': 'Cortex-M0plus', 'mfpu': 'none', @@ -568,6 +568,9 @@ def __init__(self, toolchain, device, optimize): def get_root_from_env(self): keys = sorted((k for k in os.environ.keys() if k.startswith(f'{self._toolchain}_TOOLCHAIN_')), reverse=True) + if not keys: + print(f"Toolchain '{self._toolchain}' not registered!") + return None return os.environ.get(keys[0]) def get_root(self): @@ -697,6 +700,9 @@ def get_ccflags(self): for feature in DEVICES[device]['features']: config.available_features.add(feature) +objdump = os.path.join(Toolchain("CLANG", "none", "none").get_root(), 'llvm-objdump') +config.substitutions.append(("llvm-objdump", objdump)) + config.substitutions.append(("%ccout%", "-o")) config.substitutions.append(("%cc%", tc.get_cc())) config.substitutions.append(("%ccflags%", ' '.join(tc.get_ccflags()))) diff --git a/CMSIS/Core/Test/msp.c b/CMSIS/Core/Test/msp.c index 4e67fe128..d6f1c7e6a 100644 --- a/CMSIS/Core/Test/msp.c +++ b/CMSIS/Core/Test/msp.c @@ -1,5 +1,5 @@ // REQUIRES: thumbv6m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/nop.c b/CMSIS/Core/Test/nop.c index 873c25e43..15fe4f3b4 100644 --- a/CMSIS/Core/Test/nop.c +++ b/CMSIS/Core/Test/nop.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/noreturn.c b/CMSIS/Core/Test/noreturn.c index 18a2d4782..8d2595638 100644 --- a/CMSIS/Core/Test/noreturn.c +++ b/CMSIS/Core/Test/noreturn.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/primask.c b/CMSIS/Core/Test/primask.c index 99989285d..d30ea5677 100644 --- a/CMSIS/Core/Test/primask.c +++ b/CMSIS/Core/Test/primask.c @@ -1,5 +1,5 @@ // REQUIRES: thumbv6m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/psp.c b/CMSIS/Core/Test/psp.c index 69394d791..7a173c165 100644 --- a/CMSIS/Core/Test/psp.c +++ b/CMSIS/Core/Test/psp.c @@ -1,5 +1,5 @@ // REQUIRES: thumbv6m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/psplim_baseline.c b/CMSIS/Core/Test/psplim_baseline.c index 08404b598..edf7e8cc3 100644 --- a/CMSIS/Core/Test/psplim_baseline.c +++ b/CMSIS/Core/Test/psplim_baseline.c @@ -1,6 +1,6 @@ // REQUIRES: thumbv8m.base // UNSUPPORTED: thumbv8m.main -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/rbit.c b/CMSIS/Core/Test/rbit.c index 3b55ba430..059385394 100644 --- a/CMSIS/Core/Test/rbit.c +++ b/CMSIS/Core/Test/rbit.c @@ -1,5 +1,5 @@ // REQUIRES: thumb-2 -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/rev.c b/CMSIS/Core/Test/rev.c index 70730bccd..6e97f3b96 100644 --- a/CMSIS/Core/Test/rev.c +++ b/CMSIS/Core/Test/rev.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/rev16.c b/CMSIS/Core/Test/rev16.c index ea14e0668..4956dce85 100644 --- a/CMSIS/Core/Test/rev16.c +++ b/CMSIS/Core/Test/rev16.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/revsh.c b/CMSIS/Core/Test/revsh.c index 12bca5b09..d1436ed32 100644 --- a/CMSIS/Core/Test/revsh.c +++ b/CMSIS/Core/Test/revsh.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/ror.c b/CMSIS/Core/Test/ror.c index 3870a3f8a..16356396a 100644 --- a/CMSIS/Core/Test/ror.c +++ b/CMSIS/Core/Test/ror.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/rrx.c b/CMSIS/Core/Test/rrx.c index a9b393103..9005d8dd7 100644 --- a/CMSIS/Core/Test/rrx.c +++ b/CMSIS/Core/Test/rrx.c @@ -1,5 +1,5 @@ // REQUIRES: thumb-2 -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/sev.c b/CMSIS/Core/Test/sev.c index 63ef197e6..f3cbd64fd 100644 --- a/CMSIS/Core/Test/sev.c +++ b/CMSIS/Core/Test/sev.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/simd.c b/CMSIS/Core/Test/simd.c index dd7c97d39..5e85a4fa3 100644 --- a/CMSIS/Core/Test/simd.c +++ b/CMSIS/Core/Test/simd.c @@ -480,12 +480,12 @@ void sxtb16_ror() { // CHECK: sxtb16 {{r[0-9]+}}, {{r[0-9]+}}, ror #24 result = __SXTB16_RORn(s32_1, 24); - // CHECK: ror.w [[REG:r[0-9]+]], {{r[0-9]+}}, #0x5 + // CHECK: ror.w [[REG:r[0-9]+]], {{r[0-9]+}}, {{#5|#0x5}} // CHECK: sxtb16 {{r[0-9]+}}, [[REG]] // CHECK-NOT: , ror result = __SXTB16_RORn(s32_1, 5); - // CHECK: ror{{.w|ne}} [[REG:r[0-9]+]], {{r[0-9]+}} + // CHECK: ror{{.w|ne|s}} [[REG:r[0-9]+]], {{r[0-9]+}} // CHECK: sxtb16 {{r[0-9]+}}, [[REG]] // CHECK-NOT: , ror result = __SXTB16_RORn(s32_1, u8); @@ -505,12 +505,12 @@ void sxtab16_ror() { // CHECK: sxtab16 {{r[0-9]+}}, {{r[0-9]+}}, {{r[0-9]+}}, ror #24 result = __SXTAB16_RORn(s32_1, s32_2, 24); - // CHECK: ror.w [[REG:r[0-9]+]], {{r[0-9]+}}, #0x5 + // CHECK: ror.w [[REG:r[0-9]+]], {{r[0-9]+}}, {{#5|#0x5}} // CHECK: sxtab16 {{r[0-9]+}}, {{r[0-9]+}}, [[REG]] // CHECK-NOT: , ror result = __SXTAB16_RORn(s32_1, s32_2, 5); - // CHECK: ror{{.w|ne}} [[REG:r[0-9]+]], {{r[0-9]+}} + // CHECK: ror{{.w|ne|s}} [[REG:r[0-9]+]], {{r[0-9]+}} // CHECK: sxtab16 {{r[0-9]+}}, {{r[0-9]+}}, [[REG]] // CHECK-NOT: , ror result = __SXTAB16_RORn(s32_1, s32_2, u8); diff --git a/CMSIS/Core/Test/sp_ns.c b/CMSIS/Core/Test/sp_ns.c index c584d2856..cbeaa5648 100644 --- a/CMSIS/Core/Test/sp_ns.c +++ b/CMSIS/Core/Test/sp_ns.c @@ -1,5 +1,5 @@ // REQUIRES: thumbv8m.base -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/ssat.c b/CMSIS/Core/Test/ssat.c index ed3fcc21a..fda59f24d 100644 --- a/CMSIS/Core/Test/ssat.c +++ b/CMSIS/Core/Test/ssat.c @@ -1,5 +1,5 @@ // REQUIRES: sat -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/stl.c b/CMSIS/Core/Test/stl.c index 32e8032cc..a14815f6f 100644 --- a/CMSIS/Core/Test/stl.c +++ b/CMSIS/Core/Test/stl.c @@ -1,5 +1,5 @@ // REQUIRES: armv8m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/stlex.c b/CMSIS/Core/Test/stlex.c index 879a3e542..c254f0a52 100644 --- a/CMSIS/Core/Test/stlex.c +++ b/CMSIS/Core/Test/stlex.c @@ -1,5 +1,5 @@ // REQUIRES: armv8m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/strex.c b/CMSIS/Core/Test/strex.c index 3b264caec..df55c95b6 100644 --- a/CMSIS/Core/Test/strex.c +++ b/CMSIS/Core/Test/strex.c @@ -1,5 +1,5 @@ // REQUIRES: ldrex -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/strt.c b/CMSIS/Core/Test/strt.c index cc9fd5b47..9653480c7 100644 --- a/CMSIS/Core/Test/strt.c +++ b/CMSIS/Core/Test/strt.c @@ -1,5 +1,5 @@ // REQUIRES: thumb-2 -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/systick.c b/CMSIS/Core/Test/systick.c index acbacdb5c..fd183b20b 100644 --- a/CMSIS/Core/Test/systick.c +++ b/CMSIS/Core/Test/systick.c @@ -1,5 +1,5 @@ // REQUIRES: unsupported -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include diff --git a/CMSIS/Core/Test/usat.c b/CMSIS/Core/Test/usat.c index 24ad18c57..e502c9909 100644 --- a/CMSIS/Core/Test/usat.c +++ b/CMSIS/Core/Test/usat.c @@ -1,5 +1,5 @@ // REQUIRES: sat -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/vcpkg-configuration.json b/CMSIS/Core/Test/vcpkg-configuration.json index 8adcee8a5..f701a37e9 100644 --- a/CMSIS/Core/Test/vcpkg-configuration.json +++ b/CMSIS/Core/Test/vcpkg-configuration.json @@ -13,8 +13,7 @@ ], "requires": { "arm:compilers/arm/armclang":"^6.20.0", - "arm:compilers/arm/arm-none-eabi-gcc": "^12.2.1-0", - "arm:compilers/arm/llvm-embedded": "^16.0.0" + "arm:compilers/arm/arm-none-eabi-gcc": "^12.2.1-0" } } \ No newline at end of file diff --git a/CMSIS/Core/Test/wfi.c b/CMSIS/Core/Test/wfi.c index 3787c301d..08e5aab6c 100644 --- a/CMSIS/Core/Test/wfi.c +++ b/CMSIS/Core/Test/wfi.c @@ -1,4 +1,4 @@ -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h" diff --git a/CMSIS/Core/Test/xpsr.c b/CMSIS/Core/Test/xpsr.c index 45cacc9d4..18cdf806c 100644 --- a/CMSIS/Core/Test/xpsr.c +++ b/CMSIS/Core/Test/xpsr.c @@ -1,6 +1,6 @@ // REQUIRES: thumbv6m -// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s +// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --triple=%triple% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s #include "cmsis_compiler.h"