Skip to content

Commit 31470dc

Browse files
authored
Merge pull request #8327 from tautschnig/github-4-vcpus
Use all 4 vCPUs on GitHub-hosted runners
2 parents bc46c88 + 8904113 commit 31470dc

8 files changed

+71
-69
lines changed

.github/workflows/build-and-test-Linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Build CBMC tools
4343
run: |
4444
make -C src minisat2-download
45-
make -C src CXX='ccache /usr/bin/clang++' cbmc.dir goto-cc.dir goto-diff.dir -j2
45+
make -C src CXX='ccache /usr/bin/clang++' cbmc.dir goto-cc.dir goto-diff.dir -j4
4646
- name: Print ccache stats
4747
run: ccache -s
4848

.github/workflows/build-and-test-Xen.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Build CBMC tools
4242
run: |
4343
make -C src minisat2-download
44-
make -C src CXX='ccache /usr/bin/clang++' cbmc.dir goto-cc.dir goto-diff.dir -j2
44+
make -C src CXX='ccache /usr/bin/clang++' cbmc.dir goto-cc.dir goto-diff.dir -j4
4545
- name: Print ccache stats
4646
run: ccache -s
4747

@@ -58,7 +58,7 @@ jobs:
5858
ln -s goto-cc src/goto-cc/goto-g++
5959
6060
- name: Compile Xen with CBMC via one-line-scan, and check for goto-cc section
61-
run: one-line-scan/one-line-scan --add-to-path $(pwd)/src/cbmc --add-to-path $(pwd)/src/goto-diff --add-to-path $(pwd)/src/goto-cc --no-analysis --trunc-existing --extra-cflags -Wno-error -o CPROVER -j 3 -- make -C xen_4_13 xen -j $(nproc)
61+
run: one-line-scan/one-line-scan --add-to-path $(pwd)/src/cbmc --add-to-path $(pwd)/src/goto-diff --add-to-path $(pwd)/src/goto-cc --no-analysis --trunc-existing --extra-cflags -Wno-error -o CPROVER -j 4 -- make -C xen_4_13 xen -j $(nproc)
6262

6363
- name: Check for goto-cc section in xen-syms binary
6464
run: objdump -h xen_4_13/xen/xen-syms | grep "goto-cc"

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545
- name: Build
4646
run: |
4747
make -C src minisat2-download
48-
make -C src -j2
49-
make -C unit -j2
50-
make -C jbmc/src -j2
51-
make -C jbmc/unit -j2
48+
make -C src -j4
49+
make -C unit -j4
50+
make -C jbmc/src -j4
51+
make -C jbmc/unit -j4
5252
5353
- name: Perform CodeQL Analysis
5454
uses: github/codeql-action/analyze@v3

.github/workflows/csmith.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: ccache -z --max-size=500M
4040
- name: Build with make
4141
run: |
42-
make -C src CXX='ccache /usr/bin/clang++' cbmc.dir goto-cc.dir goto-instrument.dir -j2
42+
make -C src CXX='ccache /usr/bin/clang++' cbmc.dir goto-cc.dir goto-instrument.dir -j4
4343
- name: Print ccache stats
4444
run: ccache -s
4545
- name: Run 10 randomly-generated CSmith tests

.github/workflows/performance.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: ccache environment (new variant)
6666
run: echo "CCACHE_BASEDIR=$PWD/new" >> $GITHUB_ENV
6767
- name: Build with Ninja (new variant)
68-
run: ninja -C new/build -j2
68+
run: ninja -C new/build -j4
6969
- name: Print ccache stats (new variant)
7070
run: ccache -s
7171

@@ -74,7 +74,7 @@ jobs:
7474
- name: ccache environment (old variant)
7575
run: echo "CCACHE_BASEDIR=$PWD/old" >> $GITHUB_ENV
7676
- name: Build with Ninja (old variant)
77-
run: ninja -C old/build -j2
77+
run: ninja -C old/build -j4
7878
- name: Print ccache stats (old variant)
7979
run: ccache -s
8080

.github/workflows/pull-request-check-rust-api.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Configure using CMake
5757
run: cmake -S. -B${{env.default_build_dir}} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_COMPILER=/usr/bin/clang-13 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-13 -DWITH_JBMC=OFF
5858
- name: Build with CMake
59-
run: cmake --build ${{env.default_build_dir}} -j2 --target cprover-api-cpp
59+
run: cmake --build ${{env.default_build_dir}} -j4 --target cprover-api-cpp
6060
- name: Print ccache stats
6161
run: ccache -s
6262
# We won't be running any of the regular regression tests, as these are covered
@@ -97,7 +97,7 @@ jobs:
9797
- name: Configure using CMake
9898
run: cmake -S. -B${{env.default_build_dir}} -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DWITH_JBMC=OFF
9999
- name: Build with Ninja
100-
run: cd ${{env.default_build_dir}}; ninja -j3 cprover-api-cpp
100+
run: cd ${{env.default_build_dir}}; ninja -j4 cprover-api-cpp
101101
- name: Print ccache stats
102102
run: ccache -s
103103
# We won't be running any of the regular regression tests, as these are covered

0 commit comments

Comments
 (0)