Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .ci/vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"registries": [
{
"name": "arm",
"kind": "artifact",
"location": "https://artifacts.tools.arm.com/vcpkg-registry"
}
],
"requires": {
"arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.12.0",
"arm:compilers/arm/armclang": "^6.24.0",
"arm:compilers/arm/arm-none-eabi-gcc": "^14.3.1",
"arm:compilers/arm/llvm-embedded": "21.1.1",
"arm:models/arm/avh-fvp": "11.30.29",
"arm:tools/kitware/cmake": "^3.31.5",
"arm:tools/ninja-build/ninja": "^1.13.2"
}
}
88 changes: 88 additions & 0 deletions .github/workflows/Build_FVP_Audio.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Copyright 2026 Arm Limited and/or its affiliates.
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the License); you may
# not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an AS IS BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Build FVP_Audio Example
on:

workflow_dispatch:
pull_request:
paths:
# Execute workflow when PR modifies this file
- .github/workflows/Build_FVP_Audio.yml
# Execute workflow when PR modifies example directory
- example/FVP_Audio/**
push:
# Execute workflow when main branch is updated
branches: [main]

#schedule:
# - cron: '00 20 * * 6'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Build:
strategy:
matrix:
context: [
{proj: FVP_Audio, build_type: Debug, target_type: SSE-300},
{proj: FVP_Audio, build_type: Release, target_type: SSE-300},

{proj: FVP_Audio, build_type: Debug, target_type: SSE-310},
{proj: FVP_Audio, build_type: Release, target_type: SSE-310},

{proj: FVP_Audio, build_type: Debug, target_type: SSE-315},
{proj: FVP_Audio, build_type: Release, target_type: SSE-315},

{proj: FVP_Audio, build_type: Debug, target_type: SSE-320},
{proj: FVP_Audio, build_type: Release, target_type: SSE-320}
]
toolchain: [AC6, GCC, CLANG]

fail-fast: false

runs-on: ubuntu-latest

steps:
- name: Checkout current repository
uses: actions/checkout@v6

- name: Install tools
uses: ARM-software/cmsis-actions/vcpkg@v1
with:
config: ".ci/vcpkg-configuration.json"

- name: Activate Arm tool license
uses: ARM-software/cmsis-actions/armlm@v1

- name: Initialize CMSIS pack root folder
run: |
cpackget init https://www.keil.com/pack/index.pidx
cpackget update-index

- name: Add local CMSIS packs
run: |
cpackget add ./ARM.AVH_FVP.pdsc

- name: Build Test
working-directory: ./example/FVP_Audio
run: |
cbuild FVP_Audio.csolution.yml \
--context .${{matrix.context.build_type}}+${{matrix.context.target_type}} \
--toolchain ${{matrix.toolchain}} \
--update-rte --rebuild --packs
88 changes: 88 additions & 0 deletions .github/workflows/Build_FVP_Video.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Copyright 2026 Arm Limited and/or its affiliates.
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the License); you may
# not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an AS IS BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Build FVP_Video Example
on:

workflow_dispatch:
pull_request:
paths:
# Execute workflow when PR modifies this file
- .github/workflows/Build_FVP_Video.yml
# Execute workflow when PR modifies example directory
- example/FVP_Video/**
push:
# Execute workflow when main branch is updated
branches: [main]

#schedule:
# - cron: '00 20 * * 6'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Build:
strategy:
matrix:
context: [
{proj: FVP_Video, build_type: Debug, target_type: SSE-300},
{proj: FVP_Video, build_type: Release, target_type: SSE-300},

{proj: FVP_Video, build_type: Debug, target_type: SSE-310},
{proj: FVP_Video, build_type: Release, target_type: SSE-310},

{proj: FVP_Video, build_type: Debug, target_type: SSE-315},
{proj: FVP_Video, build_type: Release, target_type: SSE-315},

{proj: FVP_Video, build_type: Debug, target_type: SSE-320},
{proj: FVP_Video, build_type: Release, target_type: SSE-320}
]
toolchain: [AC6, GCC, CLANG]

fail-fast: false

runs-on: ubuntu-latest

steps:
- name: Checkout current repository
uses: actions/checkout@v6

- name: Install tools
uses: ARM-software/cmsis-actions/vcpkg@v1
with:
config: ".ci/vcpkg-configuration.json"

- name: Activate Arm tool license
uses: ARM-software/cmsis-actions/armlm@v1

- name: Initialize CMSIS pack root folder
run: |
cpackget init https://www.keil.com/pack/index.pidx
cpackget update-index

- name: Add local CMSIS packs
run: |
cpackget add ./ARM.AVH_FVP.pdsc

- name: Build Test
working-directory: ./example/FVP_Video
run: |
cbuild FVP_Video.csolution.yml \
--context .${{matrix.context.build_type}}+${{matrix.context.target_type}} \
--toolchain ${{matrix.toolchain}} \
--update-rte --rebuild --packs
127 changes: 127 additions & 0 deletions .github/workflows/Build_Run_FVP_Hello.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# Copyright 2026 Arm Limited and/or its affiliates.
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the License); you may
# not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an AS IS BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Build and Run FVP_Hello Example
on:

workflow_dispatch:
pull_request:
paths:
# Execute workflow when PR modifies this file
- .github/workflows/Build_Run_FVP_Hello.yml
# Execute workflow when PR modifies example directory
- example/FVP_Hello/**
push:
# Execute workflow when main branch is updated
branches: [main]

#schedule:
# - cron: '00 20 * * 6'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Build_Run:
strategy:
matrix:
context: [
{proj: FVP_Hello, build_type: Debug, target_type: SSE-300, model: FVP_Corstone_SSE-300, layer: Corstone-300, mps: mps3},
{proj: FVP_Hello, build_type: Release, target_type: SSE-300, model: FVP_Corstone_SSE-300, layer: Corstone-300, mps: mps3},

{proj: FVP_Hello, build_type: Debug, target_type: SSE-310, model: FVP_Corstone_SSE-310, layer: Corstone-310, mps: mps3},
{proj: FVP_Hello, build_type: Release, target_type: SSE-310, model: FVP_Corstone_SSE-310, layer: Corstone-310, mps: mps3},

{proj: FVP_Hello, build_type: Debug, target_type: SSE-315, model: FVP_Corstone_SSE-315, layer: Corstone-315, mps: mps4},
{proj: FVP_Hello, build_type: Release, target_type: SSE-315, model: FVP_Corstone_SSE-315, layer: Corstone-315, mps: mps4},

{proj: FVP_Hello, build_type: Debug, target_type: SSE-320, model: FVP_Corstone_SSE-320, layer: Corstone-320, mps: mps4},
{proj: FVP_Hello, build_type: Release, target_type: SSE-320, model: FVP_Corstone_SSE-320, layer: Corstone-320, mps: mps4}
]
toolchain: [
{name: AC6, ext: axf},
{name: GCC, ext: elf},
{name: CLANG, ext: elf}
]

fail-fast: false

runs-on: ubuntu-latest

steps:
- name: Checkout current repository
uses: actions/checkout@v6

- name: Install tools
uses: ARM-software/cmsis-actions/vcpkg@v1
with:
config: ".ci/vcpkg-configuration.json"

- name: Activate Arm tool license
uses: ARM-software/cmsis-actions/armlm@v1

- name: Initialize CMSIS pack root folder
run: |
cpackget init https://www.keil.com/pack/index.pidx
cpackget update-index

- name: Add local CMSIS packs
run: |
cpackget add ./ARM.AVH_FVP.pdsc

- name: Build example
working-directory: ./example/FVP_Hello
run: |
cbuild FVP_Hello.csolution.yml \
--context .${{matrix.context.build_type}}+${{matrix.context.target_type}} \
--toolchain ${{matrix.toolchain.name}} \
--update-rte --rebuild --packs

- name: Execute example
working-directory: ./example/FVP_Hello
run: |
${{ matrix.context.model }} \
-a ./out/${{matrix.context.proj}}/${{matrix.context.target_type}}/${{matrix.context.build_type}}/${{matrix.context.proj}}.${{matrix.toolchain.ext}} \
-f ./board/${{matrix.context.layer}}/fvp_config.txt \
-C ${{matrix.context.mps}}_board.uart0.out_file=${{matrix.context.proj}}_${{matrix.context.build_type}}_${{matrix.context.target_type}}_${{matrix.toolchain.name}}.log \
--simlimit 30

- name: Show example output
working-directory: ./example/FVP_Hello
run: |
echo "FVP UART output:"
cat ${{matrix.context.proj}}_${{matrix.context.build_type}}_${{matrix.context.target_type}}_${{matrix.toolchain.name}}.log

- name: Check example output
# Disable SSE-320 output check due to known issue with FVP UART output
if: matrix.context.target_type != 'SSE-320'
working-directory: ./example/FVP_Hello
run: |
echo "Check FVP UART output:"
COUNT=$(grep "Hello World" ${{matrix.context.proj}}_${{matrix.context.build_type}}_${{matrix.context.target_type}}_${{matrix.toolchain.name}}.log | wc -l)
if [ "$COUNT" -eq 10 ]; then
echo "Passed"
else
echo "Failed"
exit 1
fi

- name: Upload FVP UART output log
uses: actions/upload-artifact@v6
with:
name: ${{matrix.context.proj}}_${{matrix.context.build_type}}_${{matrix.context.target_type}}_${{matrix.toolchain.name}}.log
path: ./example/FVP_Hello/${{matrix.context.proj}}_${{matrix.context.build_type}}_${{matrix.context.target_type}}_${{matrix.toolchain.name}}.log
33 changes: 15 additions & 18 deletions board/Corstone-300/vsi/python/vsi_audio.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2025 Arm Limited. All rights reserved.
# Copyright (c) 2025-2026 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down Expand Up @@ -88,14 +88,14 @@ def setMode(self, mode):
"""
Set the mode of the audio stream (input/output).
Args:
mode: 1 for input, 2 for output.
mode: 0 for input, 1 for output.
Returns:
True if the mode is valid, False otherwise.
Current mode value (0=input, 1=output).
"""
self.conn.send([self.SET_MODE, mode])
mode_valid = self.conn.recv()
current_mode = self.conn.recv()

return mode_valid
return current_mode

def setDevice(self, device):
"""
Expand Down Expand Up @@ -214,13 +214,12 @@ def closeServer(self):
CONTROL_ENABLE_Pos = 0
CONTROL_ENABLE_Msk = 1<<CONTROL_ENABLE_Pos
CONTROL_MODE_Pos = 1
CONTROL_MODE_Msk = 3<<CONTROL_MODE_Pos
CONTROL_CONTINUOUS_Pos = 3
CONTROL_MODE_Msk = 1<<CONTROL_MODE_Pos
CONTROL_CONTINUOUS_Pos = 2
CONTROL_CONTINUOUS_Msk = 1<<CONTROL_CONTINUOUS_Pos

CONTROL_MODE_NONE = 0
CONTROL_MODE_IN = 1
CONTROL_MODE_OUT = 2
CONTROL_MODE_IN = 0
CONTROL_MODE_OUT = 1


# STATUS register bit definitions
Expand Down Expand Up @@ -355,15 +354,13 @@ def wrCONTROL(value):
global CONTROL, STATUS

if ((value ^ CONTROL) & CONTROL_MODE_Msk) != 0:
# MODE changed
mode_valid = Audio.setMode((value & CONTROL_MODE_Msk) >> CONTROL_MODE_Pos)
if mode_valid:
logger.info("wrCONTROL: CONTROL register updated: MODE changed")
# MODE bit changed
if (value & CONTROL_MODE_Msk) != 0:
logger.info("wrCONTROL: CONTROL register updated: MODE bit set")
Audio.setMode(CONTROL_MODE_OUT)
else:
# Reset Mode
Audio.setMode(0)
value &= ~CONTROL_MODE_Msk
logger.error("wrCONTROL: CONTROL register updated: MODE cleared")
logger.info("wrCONTROL: CONTROL register updated: MODE bit cleared")
Audio.setMode(CONTROL_MODE_IN)

if ((value ^ CONTROL) & CONTROL_ENABLE_Msk) != 0:
# ENABLE bit changed
Expand Down
Loading