Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update submodules. #65

Merged
merged 2 commits into from
Oct 19, 2024
Merged

Update submodules. #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d757a
Update submodules and runner version.
fruffy Oct 18, 2024
f062aee
Try a different install approach.
fruffy Oct 19, 2024
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
54 changes: 37 additions & 17 deletions .github/workflows/pytest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,39 @@
name: test
on: [push]
name: "test-debian"

on:
push:
branches: [master]
pull_request:
branches: [master]
merge_group:
branches: [master]

# Cancel any preceding run on the pull request.
concurrency:
group: test-p4c-debian-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
test:
runs-on: ubuntu-18.04
# Build with GCC and test P4C on Ubuntu 22.04.
test-ubuntu22:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ matrix.os }}
max-size: 1000M
- name: Install
run: |
./do_install.sh RUN_CI=ON
- name: Test with CMake
run: |
cd modules/p4c/build
ctest -j4 -R toz3-validate --output-on-failure --schedule-random
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: ccache
uses: hendrikmuhs/[email protected]
with:
key: test-${{ runner.os }}-ubuntu22
max-size: 1000M

- name: Install
run: |
./do_install.sh RUN_CI=ON

- name: Test with CMake
run: |
cd modules/p4c/build
ctest -j4 -R toz3-validate --output-on-failure --schedule-random
11 changes: 5 additions & 6 deletions do_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ sudo apt install -y bison \
build-essential \
cmake \
git \
ninja-build \
clang \
lld \
flex \
libboost-dev \
libboost-graph-dev \
Expand Down Expand Up @@ -113,10 +116,6 @@ sudo make install
cd ${SRC_DIR}
fi

# If the behavioral model dependencies did not cover filesystem
# This is needed for the validation binaries
sudo apt install libboost-filesystem-dev

# grab the toz3 extension for the p4 compiler
mkdir -p ${MODULE_DIR}/p4c/extensions
# only install bludgeon if we are not running in CI
Expand All @@ -131,8 +130,8 @@ echo "Building P4C..."
cd ${MODULE_DIR}/p4c
mkdir -p build
cd build
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo
make -j `getconf _NPROCESSORS_ONLN`
cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF -DCMAKE_LINKER=/usr/bin/lld -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja -DCMAKE_UNITY_BUILD=ON -DENABLE_TEST_TOOLS=OFF -DENABLE_GTESTS=OFF -DENABLE_EBPF=OFF -DENABLE_UBPF=OFF -DENABLE_DPDK=OFF -DENABLE_P4TC=OFF -DENABLE_P4FMT=OFF -DENABLE_P4C_GRAPHS=OFF
cmake --build .
cd ../..

echo "Gauntlet installation completed successfully."
2 changes: 1 addition & 1 deletion modules/behavioral-model
Open in desktop
Submodule behavioral-model updated 134 files
2 changes: 1 addition & 1 deletion modules/p4c
Open in desktop
Submodule p4c updated 1839 files
2 changes: 1 addition & 1 deletion modules/toz3
Open in desktop
Submodule toz3 updated 57 files
+13 −0 .github/dependabot.yml
+4 −2 .github/workflows/build.yml
+2 −2 .github/workflows/cpplint.yml
+4 −2 .github/workflows/test_pruner.yml
+4 −2 .github/workflows/test_validate.yml
+7 −5 common/create_z3.cpp
+4 −11 common/create_z3.h
+2 −2 common/expressions.cpp
+2 −2 common/operands.cpp
+2 −2 common/parser.cpp
+3 −3 common/scope.h
+2 −2 common/state.cpp
+3 −3 common/state.h
+5 −6 common/type_base.h
+6 −6 common/type_complex.cpp
+2 −2 common/type_complex.h
+2 −2 common/type_simple.cpp
+2 −2 common/type_simple.h
+2 −2 common/type_table.cpp
+3 −3 common/util.cpp
+2 −2 common/util.h
+2 −2 common/visitor_interpret.cpp
+2 −2 common/visitor_interpret.h
+2 −2 common/visitor_specialize.cpp
+2 −2 common/visitor_specialize.h
+14 −14 compare/compare.cpp
+2 −2 compare/compare.h
+21 −21 compare/main.cpp
+2 −2 compare/options.cpp
+2 −2 compare/options.h
+2 −2 externs/core.cpp
+21 −22 interpret/main.cpp
+2 −2 interpret/options.cpp
+2 −2 interpret/options.h
+4 −4 pruner/src/boolean_pruner.cpp
+3 −4 pruner/src/boolean_pruner.h
+8 −11 pruner/src/compiler_pruner.cpp
+3 −4 pruner/src/compiler_pruner.h
+2 −2 pruner/src/constants.h
+2 −2 pruner/src/counter.cpp
+2 −2 pruner/src/counter.h
+4 −5 pruner/src/expression_pruner.cpp
+3 −4 pruner/src/expression_pruner.h
+2 −2 pruner/src/extended_unused.cpp
+2 −2 pruner/src/extended_unused.h
+51 −48 pruner/src/main.cpp
+2 −2 pruner/src/pruner_options.cpp
+2 −2 pruner/src/pruner_options.h
+5 −7 pruner/src/pruner_util.cpp
+6 −8 pruner/src/pruner_util.h
+7 −11 pruner/src/replace_variables.cpp
+3 −4 pruner/src/replace_variables.h
+6 −6 pruner/src/statement_pruner.cpp
+4 −4 pruner/src/statement_pruner.h
+44 −41 validate/main.cpp
+4 −0 validate/options.cpp
+4 −0 validate/options.h