Skip to content

Commit d32e349

Browse files
geddy11geddy11
authored
Merge pull request #26 from geddy11/issue25
Issue25
2 parents 47146cf + 73a6e36 commit d32e349

File tree

4 files changed

+117
-4
lines changed

4 files changed

+117
-4
lines changed

‎.github/workflows/netwiz_ci.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99

1010
jobs:
11-
simulate:
11+
ghdl_sim:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: ghdl/setup-ghdl-ci@nightly
@@ -19,8 +19,32 @@ jobs:
1919
- name: sim
2020
working-directory: ./script
2121
run: bash ghdl_run_all.sh
22+
# while we wait for the official nvc githib action, we simply install nvc in the GHDL container.
23+
nvc_sim:
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: ghdl/setup-ghdl-ci@nightly
27+
with:
28+
backend: llvm
29+
- name: checkout
30+
uses: actions/checkout@v3
31+
# nvc install from source
32+
- name: clone
33+
run: git clone https://github.com/nickg/nvc.git
34+
- name: prepare
35+
working-directory: ./nvc
36+
run: ./autogen.sh && mkdir build
37+
- name: update
38+
run: sudo apt-get install build-essential automake autoconf flex check llvm-dev pkg-config zlib1g-dev libdw-dev libffi-dev libzstd-dev
39+
- name: compile
40+
working-directory: ./nvc/build
41+
run: ../configure && make && sudo make install
42+
# simulate
43+
- name: sim
44+
working-directory: ./script
45+
run: bash nvc_run_all.sh
2246
document:
23-
needs: simulate
47+
needs: [ghdl_sim, nvc_sim]
2448
runs-on: ubuntu-latest
2549
steps:
2650
- uses: DenverCoder1/[email protected]

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ html
33
_NVC_LIB
44
*~
55
script/*
6-
!script/ghdl_run_all.sh
7-
!script/modelsim_run_all.do
6+
!script/*.sh
7+
!script/*.do

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.3.1] - 2023-10-16
9+
10+
### Changed
11+
- Added additional simulation job using nvc.
12+
813
## [1.3.0] - 2023-10-13
914

1015
### Added

‎script/nvc_run_all.sh

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#!/bin/bash
2+
# MIT License
3+
#
4+
# Copyright (c) 2023 Geir Drange
5+
#
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included in all
14+
# copies or substantial portions of the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
# SOFTWARE.
23+
echo -e "\n"
24+
echo "███ ██ ███████ ████████ ██ ██ ██ ███████ "
25+
echo "████ ██ ██ ██ ██ ██ ██ ███ "
26+
echo "██ ██ ██ █████ ██ ██ █ ██ ██ ███ "
27+
echo "██ ██ ██ ██ ██ ██ ███ ██ ██ ███ "
28+
echo "██ ████ ███████ ██ ███ ███ ██ ███████ "
29+
# nw_adapt
30+
nvc --std=2008 --work=nw_adapt -a ../nw_adapt/src/nw_adaptations_pkg.vhd
31+
# nw_util
32+
echo -e "\nTesting nw_util:"
33+
nvc --std=2008 --work=nw_util -a ../nw_util/src/nw_types_pkg.vhd
34+
nvc --std=2008 --work=nw_util -L . -a ../nw_util/src/nw_util_pkg.vhd
35+
nvc --std=2008 --work=nw_util -L . -a ../nw_util/src/nw_crc_pkg.vhd
36+
nvc --std=2008 --work=nw_util -L . -a ../nw_util/src/nw_nrs_pkg.vhd
37+
nvc --std=2008 --work=nw_util -L . -a ../nw_util/src/nw_prbs_pkg.vhd
38+
nvc --std=2008 --work=nw_util -L . -a ../nw_util/src/nw_util_context.vhd
39+
nvc --std=2008 -L . -a ../nw_util/tb/nw_util_tb.vhd -e nw_util_tb -r
40+
# nw_pcap
41+
echo -e "\nTesting nw_pcap:"
42+
nvc --std=2008 --work=nw_pcap -L . -a ../nw_pcap/src/nw_pcap_pkg.vhd
43+
nvc --std=2008 -L . -a ../nw_pcap/tb/nw_pcap_tb.vhd -e nw_pcap_tb -r
44+
# nw_ethernet
45+
echo -e "\nTesting nw_ethernet:"
46+
nvc --std=2008 --work=nw_ethernet -L . -a ../nw_ethernet/src/nw_ethernet_pkg.vhd
47+
nvc --std=2008 --work=nw_ethernet -L . -a ../nw_ethernet/src/nw_arp_pkg.vhd
48+
nvc --std=2008 --work=nw_ethernet -L . -a ../nw_ethernet/src/nw_ethernet_context.vhd
49+
nvc --std=2008 --work=work -L . -a ../nw_ethernet/tb/nw_ethernet_tb.vhd -e nw_ethernet_tb -r
50+
# nw_ipv4
51+
echo -e "\nTesting nw_ipv4"
52+
nvc --std=2008 --work=nw_ipv4 -L . -a ../nw_ipv4/src/ip_protocols_pkg.vhd
53+
nvc --std=2008 --work=nw_ipv4 -L . -a ../nw_ipv4/src/nw_ipv4_pkg.vhd
54+
nvc --std=2008 --work=nw_ipv4 -L . -a ../nw_ipv4/src/nw_udpv4_pkg.vhd
55+
nvc --std=2008 --work=nw_ipv4 -L . -a ../nw_ipv4/src/nw_icmpv4_pkg.vhd
56+
nvc --std=2008 --work=nw_ipv4 -L . -a ../nw_ipv4/src/nw_tcpv4_pkg.vhd
57+
nvc --std=2008 --work=nw_ipv4 -L . -a ../nw_ipv4/src/nw_ipv4_context.vhd
58+
nvc --std=2008 --work=work -L . -a ../nw_ipv4/tb/nw_ipv4_tb.vhd -e nw_ipv4_tb -r
59+
# nw_ipv6
60+
echo -e "\nTesting nw_ipv6"
61+
nvc --std=2008 --work=nw_ipv6 -L . -a ../nw_ipv6/src/nw_ipv6_pkg.vhd
62+
nvc --std=2008 --work=nw_ipv6 -L . -a ../nw_ipv6/src/nw_udpv6_pkg.vhd
63+
nvc --std=2008 --work=nw_ipv6 -L . -a ../nw_ipv6/src/nw_icmpv6_pkg.vhd
64+
nvc --std=2008 --work=nw_ipv6 -L . -a ../nw_ipv6/src/nw_tcpv6_pkg.vhd
65+
nvc --std=2008 --work=nw_ipv6 -L . -a ../nw_ipv6/src/nw_ipv6_context.vhd
66+
nvc --std=2008 --work=work -L . -a ../nw_ipv6/tb/nw_ipv6_tb.vhd -e nw_ipv6_tb -r
67+
# nw_codec
68+
echo -e "\nTesting nw_codec"
69+
nvc --std=2008 --work=nw_codec -L . -a ../nw_codec/src/nw_sl_codec_pkg.vhd
70+
nvc --std=2008 --work=nw_codec -L . -a ../nw_codec/src/nw_cobs_pkg.vhd
71+
nvc --std=2008 --work=nw_codec -L . -a ../nw_codec/src/nw_base_pkg.vhd
72+
nvc --std=2008 --work=nw_codec -L . -a ../nw_codec/src/nw_bitstuff_pkg.vhd
73+
nvc --std=2008 --work=nw_codec -L . -a ../nw_codec/src/nw_hamming_pkg.vhd
74+
nvc --std=2008 --work=nw_codec -L . -a ../nw_codec/src/nw_codec_context.vhd
75+
nvc --std=2008 --work=work -L . -a ../nw_codec/tb/nw_codec_tb.vhd -e nw_codec_tb -r
76+
# nw_ptp
77+
echo -e "\nTesting nw_ptp"
78+
nvc --std=2008 --work=nw_ptp -L . -a ../nw_ptp/src/nw_ptpv2_pkg.vhd
79+
nvc --std=2008 --work=work -L . -a ../nw_ptp/tb/nw_ptp_tb.vhd -e nw_ptp_tb -r
80+
# nw_usb
81+
echo -e "\nTesting nw_usb"
82+
nvc --std=2008 --work=nw_usb -L . -a ../nw_usb/src/nw_usb_pkg.vhd
83+
nvc --std=2008 --work=nw_usb -L . -a ../nw_usb/src/nw_usb_context.vhd
84+
nvc --std=2008 --work=work -L . -a ../nw_usb/tb/nw_usb_tb.vhd -e nw_usb_tb -r

0 commit comments

Comments
 (0)