Skip to content

Commit f976e9c

Browse files
vaughnbetzvaughnbetz
authored
Merge branch 'master' into routing_constraints
2 parents 5c65093 + 2d967b3 commit f976e9c

File tree

263 files changed

+25108
-4649
lines changed

Some content is hidden

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

263 files changed

+25108
-4649
lines changed

‎dev/subtree_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
name="capnproto"
3434
internal_path="libs/EXTERNAL/capnproto"
3535
external_url="https://github.com/capnproto/capnproto.git"
36-
default_external_ref="v0.9.1"/>
36+
default_external_ref="v1.0.2"/>
3737
<subtree
3838
name="libinterchange"
3939
internal_path="libs/EXTERNAL/libinterchange"

‎doc/src/arch/reference.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2030,15 +2030,15 @@ The ``<segment>`` tag and its contents are described below.
20302030
20312031
.. arch:tag:: <mux name="string"/>
20322032
2033-
:req_param name: Name of the mux switch type used to drive this type of segment.
2033+
:req_param name: Name of the mux switch type used to drive this type of segment by default, from both block outputs and other wires. This information is used during rr-graph construction, and a custom switch block can override this switch type for specific connections if desired.
20342034
20352035
.. note:: For UNIDIRECTIONAL only.
20362036
20372037
Tag must be included and ``name`` must be the same as the name you give in ``<switch type="mux" name="...``
20382038
20392039
.. arch:tag:: <wire_switch name="string"/>
20402040
2041-
:req_param name: Name of the switch type used by other wires to drive this type of segment.
2041+
:req_param name: Name of the switch type used by other wires to drive this type of segment by default. This information is used during rr-graph construction, and a custom switch block can override this switch type for specific connections if desired.
20422042
20432043
.. note:: For BIDIRECTIONAL only.
20442044

‎libs/EXTERNAL/capnproto/.cirrus.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
env:
2+
CIRRUS_CLONE_DEPTH: 1
3+
4+
freebsd_task:
5+
matrix:
6+
- name: FreeBSD 13.0 (GCC 10 from packages)
7+
# RunCatchingExceptionsOtherException fails on 13.0 with system Clang
8+
# 11.0 and ports Clang 10/11 as well, so GCC 10 is used instead.
9+
freebsd_instance:
10+
image_family: freebsd-13-0
11+
preinstall_script:
12+
# Stock clang11 fails some exception unit tests
13+
pkg install -y gcc10
14+
env:
15+
CC: gcc10
16+
CXX: g++10
17+
- name: FreeBSD 12.2 (System Clang 10)
18+
freebsd_instance:
19+
image_family: freebsd-12-2
20+
- name: FreeBSD 11.4 (System Clang 10)
21+
freebsd_instance:
22+
image_family: freebsd-11-4
23+
install_script:
24+
pkg install -y automake autoconf libtool
25+
compiler_version_script:
26+
${CXX:-"c++"} --version
27+
autoreconf_script:
28+
- cd c++ && autoreconf -i
29+
configure_script:
30+
- cd c++ && ./configure
31+
build_script:
32+
- make -C c++
33+
test_script:
34+
- make -C c++ check

‎libs/EXTERNAL/capnproto/.github/workflows/quick-test.yml

Lines changed: 90 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,36 @@ on:
1010
- 'release-*'
1111

1212
jobs:
13+
Linux-musl:
14+
runs-on: ubuntu-20.04
15+
container: alpine:3.16.3
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: install dependencies
19+
run: apk add autoconf automake bash build-base cmake libtool libucontext-dev linux-headers openssl-dev
20+
- name: super-test
21+
run: ./super-test.sh quick
22+
Linux-old:
23+
runs-on: ubuntu-20.04
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
compiler: [g++-7, clang-6.0]
28+
steps:
29+
- uses: actions/checkout@v2
30+
- name: install dependencies
31+
run: |
32+
export DEBIAN_FRONTEND=noninteractive
33+
sudo apt-get install -y build-essential git zlib1g-dev cmake libssl-dev ${{ matrix.compiler }}
34+
- name: super-test
35+
run: |
36+
./super-test.sh quick ${{ matrix.compiler }}
1337
Linux:
1438
runs-on: ubuntu-latest
1539
strategy:
1640
fail-fast: false
1741
matrix:
18-
compiler: [g++-7, g++-10, clang-6.0, clang-10]
42+
compiler: [g++-12, clang-14]
1943
steps:
2044
- uses: actions/checkout@v2
2145
- name: install dependencies
@@ -26,7 +50,7 @@ jobs:
2650
run: |
2751
./super-test.sh quick ${{ matrix.compiler }}
2852
Linux-lock-tracking:
29-
runs-on: ubuntu-latest
53+
runs-on: ubuntu-20.04
3054
strategy:
3155
fail-fast: false
3256
matrix:
@@ -42,6 +66,24 @@ jobs:
4266
run: |
4367
# librt is used for timer_create in the unit tests for lock tracking (mutex-test.c++).
4468
./super-test.sh quick ${{ matrix.compiler }} cpp-features "${{matrix.features}}" extra-libs "-lrt"
69+
ManyLinux:
70+
runs-on: ubuntu-20.04
71+
strategy:
72+
fail-fast: false
73+
matrix:
74+
include:
75+
- cross-compiler: manylinux2014-x64
76+
- cross-compiler: manylinux2014-x86
77+
docker-run-args: --platform linux/386
78+
steps:
79+
- uses: actions/checkout@v2
80+
- name: install dockcross
81+
run: |
82+
docker run ${{ matrix.docker-run-args }} --rm dockcross/${{ matrix.cross-compiler }} > ./dockcross
83+
chmod +x ./dockcross
84+
- name: super-test
85+
run: |
86+
./dockcross ./super-test.sh quick g++
4587
MacOS:
4688
runs-on: macos-latest
4789
strategy:
@@ -59,13 +101,13 @@ jobs:
59101
strategy:
60102
fail-fast: false
61103
matrix:
62-
os: ['windows-2016', 'windows-latest']
104+
os: ['windows-2019', 'windows-latest']
63105
include:
64-
- os: windows-2016
65-
target: 'Visual Studio 15 2017'
106+
- os: windows-2019
107+
target: 'Visual Studio 16 2019'
66108
arch: -A x64
67109
- os: windows-latest
68-
target: 'Visual Studio 16 2019'
110+
target: 'Visual Studio 17 2022'
69111
arch: -A x64
70112
steps:
71113
- uses: actions/checkout@v2
@@ -104,7 +146,7 @@ jobs:
104146
rmdir /s /q C:\PROGRA~1\POSTGR~1
105147
106148
echo "Building Cap'n Proto with MinGW"
107-
cmake -Hc++ -Bbuild-output -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=%CD%\capnproto-c++-install -DCMAKE_SH="CMAKE_SH-NOTFOUND"
149+
cmake -Hc++ -Bbuild-output -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=%CD%\capnproto-c++-install -DCMAKE_SH="CMAKE_SH-NOTFOUND" -DCMAKE_CXX_STANDARD_LIBRARIES="-static-libgcc -static-libstdc++"
108150
cmake --build build-output --target install -- -j2
109151
110152
echo "Building Cap'n Proto samples with MinGW"
@@ -113,27 +155,49 @@ jobs:
113155
114156
cd build-output\src
115157
ctest -V -C debug
116-
Cygwin:
117-
runs-on: windows-latest
158+
# Cygwin:
159+
# runs-on: windows-latest
160+
# strategy:
161+
# fail-fast: false
162+
# steps:
163+
# - run: git config --global core.autocrlf false
164+
# - uses: actions/checkout@v2
165+
# # TODO(someday): If we could cache the Cygwin installation we wouldn't have to spend three
166+
# # minutes installing it for every build. Unfortuntaley, actions/cache@v1 does not preserve
167+
# # DOS file attributes, which corrupts the Cygwin install. In particular, Cygwin marks
168+
# # symlinks with the "DOS SYSTEM" attribute. We could cache just the downloaded packages,
169+
# # but it turns out that only saves a couple seconds; most of the time is spend unpacking.
170+
# - name: Install Cygwin
171+
# run: |
172+
# choco config get cacheLocation
173+
# choco install --no-progress cygwin
174+
# - name: Install Cygwin additional packages
175+
# shell: cmd
176+
# run: |
177+
# C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -l C:/tools/cygwin/packages -s http://mirrors.kernel.org/sourceware/cygwin/ -P autoconf,automake,libtool,gcc,gcc-g++,binutils,libssl-devel,make,zlib-devel,pkg-config,cmake,xxd
178+
# - name: Build and test
179+
# shell: cmd
180+
# run: |
181+
# C:\tools\cygwin\bin\bash -lc 'export PATH=/usr/local/bin:/usr/bin:/bin; cd /cygdrive/d/a/capnproto/capnproto; ./super-test.sh quick'
182+
Linux-bazel-clang:
183+
runs-on: ubuntu-20.04
118184
strategy:
119185
fail-fast: false
186+
matrix:
187+
clang_version: [16]
120188
steps:
121-
- run: git config --global core.autocrlf false
122-
- uses: actions/checkout@v2
123-
# TODO(someday): If we could cache the Cygwin installation we wouldn't have to spend three
124-
# minutes installing it for every build. Unfortuntaley, actions/cache@v1 does not preserve
125-
# DOS file attributes, which corrupts the Cygwin install. In particular, Cygwin marks
126-
# symlinks with the "DOS SYSTEM" attribute. We could cache just the downloaded packages,
127-
# but it turns out that only saves a couple seconds; most of the time is spend unpacking.
128-
- name: Install Cygwin
129-
run: |
130-
choco config get cacheLocation
131-
choco install --no-progress cygwin
132-
- name: Install Cygwin additional packages
133-
shell: cmd
189+
- uses: actions/checkout@v3
190+
- uses: bazelbuild/setup-bazelisk@v2
191+
- name: install dependencies
134192
run: |
135-
C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -l C:/tools/cygwin/packages -s http://mirrors.kernel.org/sourceware/cygwin/ -P autoconf,automake,libtool,gcc,gcc-g++,binutils,libssl-devel,make,zlib-devel,pkg-config,cmake,xxd
136-
- name: Build and test
137-
shell: cmd
193+
export DEBIAN_FRONTEND=noninteractive
194+
sudo apt-get install -y build-essential git
195+
# todo: replace with apt-get when clang-16 is part of ubuntu lts
196+
- name: install clang
197+
uses: egor-tensin/setup-clang@v1
198+
with:
199+
version: ${{ matrix.clang_version }}
200+
- name: super-test
138201
run: |
139-
C:\tools\cygwin\bin\bash -lc 'export PATH=/usr/local/bin:/usr/bin:/bin; cd /cygdrive/d/a/capnproto/capnproto; ./super-test.sh quick'
202+
cd c++
203+
bazel test --verbose_failures --test_output=errors //...

‎libs/EXTERNAL/capnproto/.github/workflows/release-test.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ on:
99

1010
jobs:
1111
Linux:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-20.04
1313
strategy:
1414
fail-fast: false
1515
matrix:
1616
# We can only run extended tests with the default version of g++, because it has to match
17-
# the verison of g++-multilib for 32-bit cross-compilation, and alternate versions of
17+
# the version of g++-multilib for 32-bit cross-compilation, and alternate versions of
1818
# g++-multilib generally aren't available. Clang is more lenient, but we might as well be
1919
# consistent. The quick tests should be able to catch issues with older and newer compiler
2020
# versions.
@@ -42,11 +42,21 @@ jobs:
4242
run: |
4343
./super-test.sh
4444
MinGW-Wine:
45-
runs-on: ubuntu-latest
45+
runs-on: ubuntu-20.04
4646
strategy:
4747
fail-fast: false
4848
steps:
4949
- uses: actions/checkout@v2
50+
# See: https://github.com/actions/virtual-environments/issues/4589#issuecomment-1100899313
51+
# GitHub's Ubuntu image installs all kinds of stuff from non-Ubuntu repositories which cause
52+
# conflicts with Ubuntu packages ultimately preventing installation of wine32. Let's try to
53+
# fix that...
54+
- name: remove unwanted packages and repositories
55+
run: |
56+
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
57+
sudo apt-get update -qq
58+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
59+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
5060
- name: install dependencies
5161
run: |
5262
export DEBIAN_FRONTEND=noninteractive
@@ -61,7 +71,7 @@ jobs:
6171
run: |
6272
./super-test.sh mingw i686-w64-mingw32
6373
cmake-packaging:
64-
runs-on: ubuntu-latest
74+
runs-on: ubuntu-20.04
6575
strategy:
6676
fail-fast: false
6777
steps:
@@ -83,7 +93,7 @@ jobs:
8393
run: |
8494
./super-test.sh cmake-package cmake-static
8595
Android:
86-
runs-on: ubuntu-latest
96+
runs-on: ubuntu-20.04
8797
strategy:
8898
fail-fast: false
8999
steps:

‎libs/EXTERNAL/capnproto/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# Ekam build artifacts.
2222
/c++/tmp/
2323
/c++/bin/
24+
/c++/deps/
2425

2526
# setup-ekam.sh
2627
/c++/.ekam
@@ -71,6 +72,13 @@
7172
/c++/m4/ltversion.m4
7273
/c++/m4/lt~obsolete.m4
7374
/c++/samples/addressbook
75+
/c++/.cache/
7476

7577
# editor artefacts
7678
*~
79+
80+
# cross-compiling / glibc testing
81+
/dockcross
82+
83+
# bazel output
84+
bazel-*

‎libs/EXTERNAL/capnproto/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
cmake_minimum_required(VERSION 3.4...3.13) # ! This line is edited to get rid of a CMake deprecation error
1+
cmake_minimum_required(VERSION 3.16)
22
project("Cap'n Proto Root" CXX)
3+
include(CTest)
4+
35
add_subdirectory(c++)

‎libs/EXTERNAL/capnproto/c++/.bazelignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ekam-provider

‎libs/EXTERNAL/capnproto/c++/.bazelrc

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
common --enable_platform_specific_config
2+
3+
build:unix --cxxopt='-std=c++14' --host_cxxopt='-std=c++14' --force_pic --verbose_failures
4+
build:unix --cxxopt='-Wall' --host_cxxopt='-Wall'
5+
build:unix --cxxopt='-Wextra' --host_cxxopt='-Wextra'
6+
build:unix --cxxopt='-Wno-strict-aliasing' --host_cxxopt='-Wno-strict-aliasing'
7+
build:unix --cxxopt='-Wno-sign-compare' --host_cxxopt='-Wno-sign-compare'
8+
build:unix --cxxopt='-Wno-unused-parameter' --host_cxxopt='-Wno-unused-parameter'
9+
10+
build:linux --config=unix
11+
build:macos --config=unix
12+
13+
# See https://bazel.build/configure/windows#symlink
14+
startup --windows_enable_symlinks
15+
# We use LLVM's MSVC-compatible compiler driver to compile our code on Windows
16+
# under Bazel. MSVC is natively supported when using CMake builds.
17+
build:windows --compiler=clang-cl
18+
19+
build:windows --cxxopt='/std:c++14' --host_cxxopt='/std:c++14' --verbose_failures
20+
build:windows --cxxopt='/wo4503' --host_cxxopt='/wo4503'
21+
# The `/std:c++14` argument is unused during boringssl compilation and we don't
22+
# want a warning when compiling each file.
23+
build:windows --cxxopt='-Wno-unused-command-line-argument' --host_cxxopt='-Wno-unused-command-line-argument'
24+
25+
# build with ssl, zlib and bazel by default
26+
build --//src/kj:openssl=True --//src/kj:zlib=True --//src/kj:brotli=True

‎libs/EXTERNAL/capnproto/c++/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6.1.2

‎libs/EXTERNAL/capnproto/c++/BUILD.bazel

Whitespace-only changes.

0 commit comments

Comments
 (0)