Skip to content

Commit

Permalink
Merge branch 'main' into board-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@mithro
mithro authored Sep 6, 2024
2 parents 63d9caf + 13f1119 commit e67ca82
Show file tree
Hide file tree
Showing 94 changed files with 1,409 additions and 1,012 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
open-pull-requests-limit: 99
12 changes: 12 additions & 0 deletions .github/latest.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/docs/getting.rst
+++ b/docs/getting.rst
@@ -146,7 +146,7 @@ Next, setup Conda and your system's environment, and download architecture defin
F4PGA_HASH='007d1c1'

for PKG in $F4PGA_PACKAGES; do
- wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/${F4PGA_TIMESTAMP}/symbiflow-arch-defs-${PKG}-${F4PGA_HASH}.tar.xz | tar -xJC $F4PGA_INSTALL_DIR/${FPGA_FAM}
+ wget -qO- $(wget -qO- https://github.com/SymbiFlow/f4pga-arch-defs/releases/download/latest/symbiflow-${PKG}-latest) | tar -xJC $F4PGA_INSTALL_DIR/${FPGA_FAM}
done

If the above commands exited without errors, you have successfully installed and configured your working environment.
--
176 changes: 43 additions & 133 deletions .github/scripts/build-examples.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2020 The SymbiFlow Authors.
# Copyright 2020-2022 F4PGA Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,142 +46,52 @@ fpga_family=$1
shift

examples="$@"
if [ "$fpga_family" == "xc7" -a -z "$examples" ]; then
examples="counter picosoc litex litex_linux litex_sata button_controller timer pulse_width_led hello-a"
elif [ "$fpga_family" == "eos-s3" -a -z "$examples" ]; then
examples="counter"
if [ -z "$examples" ]; then
case "$fpga_family" in
xc7) examples="counter picosoc litex litex_linux litex_sata button_controller timer pulse_width_led hello-a" ;;
eos-s3) examples="counter" ;;
esac
fi

# activate conda and enter example dir
activate_env="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env-$fpga_family,conda-act-env"
activate_env="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env,f4pga-env-bin,f4pga-env-share-$fpga_family,conda-act-env"
snippets="${activate_env},enter-dir-$fpga_family"
additionalDesigns="${activate_env},enter-dir-$fpga_family,additional_examples"

case "$fpga_family" in
xc7) for example in $examples; do
case $example in
"counter") tuttest_exec ${snippets} xc7/counter_test/README.rst:example-counter-*-group ;;
"picosoc") tuttest_exec ${snippets} xc7/picosoc_demo/README.rst:example-picosoc-*-group ;;
"litex") tuttest_exec ${snippets} xc7/litex_demo/README.rst:example-litex-dir,example-litex-req,example-litex_picorv32-*-group,example-litex_vexriscv-*-group ;;
"litex_linux") tuttest_exec ${snippets} xc7/linux_litex_demo/README.rst:example-litex-*-group ;;
"litex_sata") tuttest_exec ${snippets} xc7/litex_sata_demo/README.rst:example-litex-sata-*-group ;;

# Xilinx 7-Series examples
if [ "$fpga_family" = "xc7" ]; then
for example in $examples; do
case $example in
"counter")
snippets="${snippets} xc7/counter_test/README.rst:example-counter-*-group"
;;
"picosoc")
snippets="${snippets} xc7/picosoc_demo/README.rst:example-picosoc-*-group"
;;
"litex")
snippets="${snippets} xc7/litex_demo/README.rst:example-litex-dir,example-litex-req,example-litex_picorv32-*-group,example-litex_vexriscv-*-group"
;;
"litex_linux")
snippets="${snippets} xc7/linux_litex_demo/README.rst:example-litex-*-group"
;;
"litex_sata")
snippets="${snippets} xc7/litex_sata_demo/README.rst:example-litex-sata-*-group"
;;
#Additional examples:
"button_controller") tuttest_exec ${activate_env},enter-dir-$fpga_family xc7/additional_examples/button_controller/README.rst:additional-examples,example-debouncer-basys3 ;;
"pulse_width_led") tuttest_exec ${snippets} xc7/pulse_width_led/README.rst:example-pulse-arty-35t ;;
"timer") tuttest_exec ${snippets} xc7/timer/README.rst:example-watch-basys3 ;;

#Additional examples:
"button_controller")
snippets="${additionalDesigns} xc7/additional_examples/button_controller/README.rst:example-debouncer-basys3"
;;
"pulse_width_led")
snippets="${snippets} xc7/pulse_width_led/README.rst:example-pulse-arty-35t"
;;
"timer")
snippets="${snippets} xc7/timer/README.rst:example-watch-basys3"
;;

# Project F examples
"hello-a")
snippets="${activate_env} projf-makefiles/hello/hello-arty/A/README.rst:hello-arty-a"
;;
"hello-b")
snippets="${activate_env} projf-makefiles/hello/hello-arty/B/README.rst:hello-arty-b"
;;
"hello-c")
snippets="${activate_env} projf-makefiles/hello/hello-arty/C/README.rst:hello-arty-c"
;;
"hello-d")
snippets="${activate_env} projf-makefiles/hello/hello-arty/D/README.rst:hello-arty-d"
;;
"hello-e")
snippets="${activate_env} projf-makefiles/hello/hello-arty/E/README.rst:hello-arty-e"
;;
"hello-f")
snippets="${activate_env} projf-makefiles/hello/hello-arty/F/README.rst:hello-arty-f"
;;
"hello-g")
snippets="${activate_env} projf-makefiles/hello/hello-arty/G/README.rst:hello-arty-g"
;;
"hello-h")
snippets="${activate_env} projf-makefiles/hello/hello-arty/H/README.rst:hello-arty-h"
;;
"hello-i")
snippets="${activate_env} projf-makefiles/hello/hello-arty/I/README.rst:hello-arty-i"
;;
"hello-j")
snippets="${activate_env} projf-makefiles/hello/hello-arty/J/README.rst:hello-arty-j"
;;
"hello-k")
snippets="${activate_env} projf-makefiles/hello/hello-arty/K/README.rst:hello-arty-k"
;;
"hello-l")
snippets="${activate_env} projf-makefiles/hello/hello-arty/L/README.rst:hello-arty-l"
;;
"hello-b")
snippets="${activate_env} projf-makefiles/hello/hello-arty/B/README.rst:hello-arty-b"
;;
"hello-c")
snippets="${activate_env} projf-makefiles/hello/hello-arty/C/README.rst:hello-arty-c"
;;
"hello-d")
snippets="${activate_env} projf-makefiles/hello/hello-arty/D/README.rst:hello-arty-d"
;;
"hello-e")
snippets="${activate_env} projf-makefiles/hello/hello-arty/E/README.rst:hello-arty-e"
;;
"hello-f")
snippets="${activate_env} projf-makefiles/hello/hello-arty/F/README.rst:hello-arty-f"
;;
"hello-g")
snippets="${activate_env} projf-makefiles/hello/hello-arty/G/README.rst:hello-arty-g"
;;
"hello-h")
snippets="${activate_env} projf-makefiles/hello/hello-arty/H/README.rst:hello-arty-h"
;;
"hello-i")
snippets="${activate_env} projf-makefiles/hello/hello-arty/I/README.rst:hello-arty-i"
;;
"hello-j")
snippets="${activate_env} projf-makefiles/hello/hello-arty/J/README.rst:hello-arty-j"
;;
"hello-k")
snippets="${activate_env} projf-makefiles/hello/hello-arty/K/README.rst:hello-arty-k"
;;
"hello-l")
snippets="${activate_env} projf-makefiles/hello/hello-arty/L/README.rst:hello-arty-l"
;;
*)
echo "ERROR: Unknown example name: $example" >&2
exit 1
;;
esac
done
# QuickLogic EOS-S3 examples
elif [ "$fpga_family" = "eos-s3" ]; then
for example in $examples; do
case $example in
"counter")
snippets="${snippets} eos-s3/btn_counter/README.rst:eos-s3-counter"
;;
*)
echo "ERROR: Unknown example name: $example" >&2
exit 1
;;
esac
done
else
echo "ERROR: Unknown fpga_family: $fpga_family" >&2
exit 1
fi

# call tuttest
tuttest_exec ${snippets}
# Project F examples
"hello") for helloexample in A B C D E F G H I J; do
tuttest_exec ${activate_env} projf-makefiles/hello/hello-arty/${helloexample}/README.rst:hello-arty-${helloexample,,}
done ;;
"hello-k") for helloexample in K L; do
tuttest_exec ${activate_env} projf-makefiles/hello/hello-arty/${helloexample}/README.rst:hello-arty-${helloexample,,}
done ;;
*) echo "ERROR: Unknown example name: $example" >&2
exit 1 ;;
esac
done
;;
eos-s3) for example in $examples; do
case $example in
"counter") tuttest_exec ${snippets} eos-s3/btn_counter/README.rst:eos-s3-counter ;;
*) echo "ERROR: Unknown example name: $example" >&2
exit 1 ;;
esac
done
;;
*) echo "ERROR: Unknown fpga_family: $fpga_family" >&2
exit 1
;;
esac
2 changes: 1 addition & 1 deletion .github/scripts/common.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2020 The SymbiFlow Authors.
# Copyright 2020-2022 F4PGA Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
113 changes: 113 additions & 0 deletions .github/scripts/generate_job_matrices.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
#!/usr/bin/env python3
#
# Copyright (C) 2021-2022 F4PGA Authors
#
# 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
#
# https://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.
#
# SPDX-License-Identifier: Apache-2.0

from os import environ
from sys import argv as sys_argv

isFork = len(sys_argv)>1 and sys_argv[1] != 'chipsalliance/f4pga-examples'

runs_on = (
'ubuntu-latest'
if isFork else
['self-hosted', 'Linux', 'X64', 'gcp-custom-runners']
)


def get_jobs(
distribution: str = 'debian',
usesSurelog: bool = False
):
examples = [
"pulse_width_led",
"hello",
]

# Skip tests that are currently unsupported
if not usesSurelog:
examples.extend([
"litex",
"picosoc",
"litex_linux",
"button_controller",
"timer",
"hello-k",
])

jobs = []
osvers = []

if distribution == "debian":
osvers.extend([
("debian", "buster"),
("debian", "bullseye"),
("debian", "sid")
])
elif distribution == "ubuntu":
osvers.extend([
("ubuntu", "focal")
])
elif distribution == "fedora":
osvers.extend([
("fedora", "35"),
("fedora", "36")
])

if not isFork:
examples.extend(["counter"])

# Skip tests that are currently unsupported
if not usesSurelog:
examples.extend(["litex_sata"])

if distribution == "ubuntu":
osvers.extend([
("ubuntu", "xenial"),
("ubuntu", "bionic"),
])
elif distribution == "centos":
osvers.extend([
("centos", "7")
])

for osver in osvers:
jobs.extend([{
'name': "Surelog" if usesSurelog else "Default",
'runs-on': runs_on,
'fpga-fam': "xc7",
'os': osver[0],
'os-version': osver[1],
'example': example,
'surelog': "-parse -DSYNTHESIS" if usesSurelog else ""
} for example in examples])

jobs.extend([{
'name': "Surelog" if usesSurelog else "Default",
'runs-on': runs_on,
'fpga-fam': "eos-s3",
'os': osver[0],
'os-version': osver[1],
'example': "counter",
'surelog': "-parse -DSYNTHESIS" if usesSurelog else ""
} for osver in osvers])

return jobs

for distribution in ['debian', 'ubuntu', 'fedora', 'centos']:
jobs = get_jobs(distribution, False) + get_jobs(distribution, True)
print(f'::set-output name={distribution}::{jobs!s}')
print(f"{distribution}: {jobs!s}")
Loading

0 comments on commit e67ca82

Please sign in to comment.